update

app/command/UpdateAll.php

@@ -25,10 +25,10 @@ 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');
         }
 
@@ -103,16 +103,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/controller/Admin.php

@@ -1,388 +1,403 @@
-<?php
-
-namespace app\controller;
-
-use app\BaseController;
-use think\facade\Db;
-use think\facade\View;
-use think\facade\Request;
-use think\facade\Cache;
-use app\lib\Btapi;
-use app\lib\Plugins;
-
-class Admin extends BaseController
-{
-    public function verifycode()
-    {
-        return captcha();
-    }
-
-    public function login(){
-        if(request()->islogin){
-            return redirect('/admin');
-        }
-        if(request()->isAjax()){
-            $username = input('post.username',null,'trim');
-            $password = input('post.password',null,'trim');
-            $code = input('post.code',null,'trim');
-    
-            if(empty($username) || empty($password)){
-                return json(['code'=>-1, 'msg'=>'用户名或密码不能为空']);
-            }
-            if(!captcha_check($code)){
-                return json(['code'=>-1, 'msg'=>'验证码错误']);
-            }
-            if($username == config_get('admin_username') && $password == config_get('admin_password')){
-                Db::name('log')->insert(['uid' => 0, 'action' => '登录后台', 'data' => 'IP:'.$this->clientip, 'addtime' => date("Y-m-d H:i:s")]);
-                $session = md5($username.config_get('admin_password'));
-                $expiretime = time()+2562000;
-                $token = authcode("{$username}\t{$session}\t{$expiretime}", 'ENCODE', config_get('syskey'));
-                cookie('admin_token', $token, ['expire' => $expiretime, 'httponly' => true]);
-                config_set('admin_lastlogin', date('Y-m-d H:i:s'));
-                return json(['code'=>0]);
-            }else{
-                return json(['code'=>-1, 'msg'=>'用户名或密码错误']);
-            }
-        }
-        return view();
-    }
-
-    public function logout()
-    {
-        cookie('admin_token', null);
-        return redirect('/admin/login');
-    }
-
-    public function index()
-    {
-        $stat = ['total'=>0, 'free'=>0, 'pro'=>0, 'ltd'=>0, 'third'=>0];
-        $json_arr = Plugins::get_plugin_list();
-        if($json_arr){
-            foreach($json_arr['list'] as $plugin){
-                $stat['total']++;
-                if($plugin['type']==10) $stat['third']++;
-                elseif($plugin['type']==12) $stat['ltd']++;
-                elseif($plugin['type']==8) $stat['pro']++;
-                elseif($plugin['type']==5 || $plugin['type']==6 || $plugin['type']==7) $stat['free']++;
-            }
-        }
-        $stat['runtime'] = Db::name('config')->where('key','runtime')->value('value') ?? '<font color="red">未运行</font>';
-        $stat['record_total'] = Db::name('record')->count();
-        $stat['record_isuse'] = Db::name('record')->whereTime('usetime', '>=', strtotime('-7 days'))->count();
-        View::assign('stat', $stat);
-
-        $tmp = 'version()';
-        $mysqlVersion = Db::query("select version()")[0][$tmp];
-        $info = [
-            'framework_version' => app()::VERSION,
-            'php_version' => PHP_VERSION,
-            'mysql_version' => $mysqlVersion,
-            'software' => $_SERVER['SERVER_SOFTWARE'],
-            'os' => php_uname(),
-            'date' => date("Y-m-d H:i:s"),
-        ];
-        View::assign('info', $info);
-        return view();
-    }
-
-    public function set(){
-        if(request()->isAjax()){
-            $params = Request::param();
-
-            foreach ($params as $key => $value) {
-                config_set($key, $value);
-            }
-            cache('configs', NULL);
-            return json(['code'=>0]);
-        }
-        $mod = input('param.mod', 'sys');
-        View::assign('mod', $mod);
-        View::assign('conf', config('sys'));
-        $runtime = Db::name('config')->where('key','runtime')->value('value') ?? '<font color="red">未运行</font>';
-        View::assign('runtime', $runtime);
-        return view();
-    }
-
-    public function setaccount(){
-        $params = Request::param();
-        if(isset($params['username']))$params['username']=trim($params['username']);
-        if(isset($params['oldpwd']))$params['oldpwd']=trim($params['oldpwd']);
-        if(isset($params['newpwd']))$params['newpwd']=trim($params['newpwd']);
-        if(isset($params['newpwd2']))$params['newpwd2']=trim($params['newpwd2']);
-
-        if(empty($params['username'])) return json(['code'=>-1, 'msg'=>'用户名不能为空']);
-
-        config_set('admin_username', $params['username']);
-
-        if(!empty($params['oldpwd']) && !empty($params['newpwd']) && !empty($params['newpwd2'])){
-            if(config_get('admin_password') != $params['oldpwd']){
-                return json(['code'=>-1, 'msg'=>'旧密码不正确']);
-            }
-            if($params['newpwd'] != $params['newpwd2']){
-                return json(['code'=>-1, 'msg'=>'两次新密码输入不一致']);
-            }
-            config_set('admin_password', $params['newpwd']);
-        }
-        cache('configs', NULL);
-        cookie('admin_token', null);
-        return json(['code'=>0]);
-    }
-
-    public function testbturl(){
-        $bt_url = input('post.bt_url');
-        $bt_key = input('post.bt_key');
-        if(!$bt_url || !$bt_key)return json(['code'=>-1, 'msg'=>'参数不能为空']);
-        $btapi = new Btapi($bt_url, $bt_key);
-        $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']:'面板地址无法连接']);
-        }
-    }
-
-    public function plugins(){
-        $typelist = [];
-        $json_arr = Plugins::get_plugin_list();
-        if($json_arr){
-            foreach($json_arr['type'] as $type){
-                $typelist[$type['id']] = $type['title'];
-            }
-        }
-        View::assign('typelist', $typelist);
-        return view();
-    }
-
-    public function pluginswin(){
-        $typelist = [];
-        $json_arr = Plugins::get_plugin_list('Windows');
-        if($json_arr){
-            foreach($json_arr['type'] as $type){
-                $typelist[$type['id']] = $type['title'];
-            }
-        }
-        View::assign('typelist', $typelist);
-        return view();
-    }
-
-    public function plugins_data(){
-        $type = input('post.type/d');
-        $keyword = input('post.keyword', null, 'trim');
-        $os = input('get.os');
-        if(!$os) $os = 'Linux';
-
-        $json_arr = Plugins::get_plugin_list($os);
-        if(!$json_arr) return json([]);
-
-        $typelist = [];
-        foreach($json_arr['type'] as $row){
-            $typelist[$row['id']] = $row['title'];
-        }
-
-        $list = [];
-        foreach($json_arr['list'] as $plugin){
-            if($type > 0 && $plugin['type']!=$type) continue;
-            if(!empty($keyword) && $keyword != $plugin['name'] && stripos($plugin['title'], $keyword)===false) continue;
-            $versions = [];
-            foreach($plugin['versions'] as $version){
-                $ver = $version['m_version'].'.'.$version['version'];
-                if(isset($version['download'])){
-                    $status = false;
-                    if(file_exists(get_data_dir().'plugins/other/'.$version['download'])){
-                        $status = true;
-                    }
-                    $versions[] = ['status'=>$status, 'type'=>1, 'version'=>$ver, 'download'=>$version['download'], 'md5'=>$version['md5']];
-                }else{
-                    $status = false;
-                    if(file_exists(get_data_dir($os).'plugins/package/'.$plugin['name'].'-'.$ver.'.zip')){
-                        $status = true;
-                    }
-                    $versions[] = ['status'=>$status, 'type'=>0, 'version'=>$ver];
-                }
-            }
-            if($plugin['name'] == 'obs') $plugin['ps'] = substr($plugin['ps'],0,strpos($plugin['ps'],'<a '));
-            $list[] = [
-                'id' => $plugin['id'],
-                'name' => $plugin['name'],
-                'title' => $plugin['title'],
-                'type' => $plugin['type'],
-                'typename' => $typelist[$plugin['type']],
-                'desc' => str_replace('target="_blank"','target="_blank" rel="noopener noreferrer"',$plugin['ps']),
-                'price' => $plugin['price'],
-                'author' => isset($plugin['author']) ? $plugin['author'] : '官方',
-                'versions' => $versions
-            ];
-        }
-        return json($list);
-    }
-
-    public function download_plugin(){
-        $name = input('post.name', null, 'trim');
-        $version = input('post.version', null, 'trim');
-        $os = input('post.os');
-        if(!$os) $os = 'Linux';
-        if(!$name || !$version) return json(['code'=>-1, 'msg'=>'参数不能为空']);
-        try{
-            Plugins::download_plugin($name, $version, $os);
-            Db::name('log')->insert(['uid' => 0, 'action' => '下载插件', 'data' => $name.'-'.$version.' os:'.$os, 'addtime' => date("Y-m-d H:i:s")]);
-            return json(['code'=>0,'msg'=>'下载成功']);
-        }catch(\Exception $e){
-            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
-        }
-    }
-
-    public function refresh_plugins(){
-        $os = input('get.os');
-        if(!$os) $os = 'Linux';
-        try{
-            Plugins::refresh_plugin_list($os);
-            Db::name('log')->insert(['uid' => 0, 'action' => '刷新插件列表', 'data' => '刷新'.$os.'插件列表成功', 'addtime' => date("Y-m-d H:i:s")]);
-            return json(['code'=>0,'msg'=>'获取最新插件列表成功！']);
-        }catch(\Exception $e){
-            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
-        }
-    }
-
-    public function record(){
-        return view();
-    }
-
-    public function record_data(){
-        $ip = input('post.ip', null, 'trim');
-        $offset = input('post.offset/d');
-        $limit = input('post.limit/d');
-
-        $select = Db::name('record');
-        if(!empty($ip)){
-            $select->where('ip', $ip);
-        }
-        $total = $select->count();
-        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
-
-        return json(['total'=>$total, 'rows'=>$rows]);
-    }
-
-    public function log(){
-        return view();
-    }
-
-    public function log_data(){
-        $action = input('post.action', null, 'trim');
-        $offset = input('post.offset/d');
-        $limit = input('post.limit/d');
-
-        $select = Db::name('log');
-        if(!empty($action)){
-            $select->where('action', $action);
-        }
-        $total = $select->count();
-        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
-
-        return json(['total'=>$total, 'rows'=>$rows]);
-    }
-
-    public function list(){
-        $type = input('param.type', 'black');
-        View::assign('type', $type);
-        View::assign('typename', $type=='white'?'白名单':'黑名单');
-        return view();
-    }
-
-    public function list_data(){
-        $type = input('param.type', 'black');
-        $ip = input('post.ip', null, 'trim');
-        $offset = input('post.offset/d');
-        $limit = input('post.limit/d');
-
-        $tablename = $type == 'black' ? 'black' : 'white';
-        $select = Db::name($tablename);
-        if(!empty($ip)){
-            $select->where('ip', $ip);
-        }
-        $total = $select->count();
-        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
-
-        return json(['total'=>$total, 'rows'=>$rows]);
-    }
-
-    public function list_op(){
-        $type = input('param.type', 'black');
-        $tablename = $type == 'black' ? 'black' : 'white';
-        $act = input('post.act', null);
-        if($act == 'get'){
-            $id = input('post.id/d');
-            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
-            $data = Db::name($tablename)->where('id', $id)->find();
-            return json(['code'=>0, 'data'=>$data]);
-        }elseif($act == 'add'){
-            $ip = input('post.ip', null, 'trim');
-            if(!$ip) return json(['code'=>-1, 'msg'=>'IP不能为空']);
-            if(Db::name($tablename)->where('ip', $ip)->find()){
-                return json(['code'=>-1, 'msg'=>'该IP已存在']);
-            }
-            Db::name($tablename)->insert([
-                'ip' => $ip,
-                'enable' => 1,
-                'addtime' => date("Y-m-d H:i:s")
-            ]);
-            return json(['code'=>0, 'msg'=>'succ']);
-        }elseif($act == 'edit'){
-            $id = input('post.id/d');
-            $ip = input('post.ip', null, 'trim');
-            if(!$id || !$ip) return json(['code'=>-1, 'msg'=>'IP不能为空']);
-            if(Db::name($tablename)->where('ip', $ip)->where('id', '<>', $id)->find()){
-                return json(['code'=>-1, 'msg'=>'该IP已存在']);
-            }
-            Db::name($tablename)->where('id', $id)->update([
-                'ip' => $ip
-            ]);
-            return json(['code'=>0, 'msg'=>'succ']);
-        }elseif($act == 'enable'){
-            $id = input('post.id/d');
-            $enable = input('post.enable/d');
-            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
-            Db::name($tablename)->where('id', $id)->update([
-                'enable' => $enable
-            ]);
-            return json(['code'=>0, 'msg'=>'succ']);
-        }elseif($act == 'del'){
-            $id = input('post.id/d');
-            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
-            Db::name($tablename)->where('id', $id)->delete();
-            return json(['code'=>0, 'msg'=>'succ']);
-        }
-        return json(['code'=>-1, 'msg'=>'no act']);
-    }
-
-    public function deplist(){
-        $deplist_linux = get_data_dir().'config/deployment_list.json';
-        $deplist_win = get_data_dir('Windows').'config/deployment_list.json';
-        $deplist_linux_time = file_exists($deplist_linux) ? date("Y-m-d H:i:s", filemtime($deplist_linux)) : '不存在';
-        $deplist_win_time = file_exists($deplist_win) ? date("Y-m-d H:i:s", filemtime($deplist_win)) : '不存在';
-        View::assign('deplist_linux_time', $deplist_linux_time);
-        View::assign('deplist_win_time', $deplist_win_time);
-        return view();
-    }
-
-    public function refresh_deplist(){
-        $os = input('get.os');
-        if(!$os) $os = 'Linux';
-        try{
-            Plugins::refresh_deplist($os);
-            Db::name('log')->insert(['uid' => 0, 'action' => '刷新一键部署列表', 'data' => '刷新'.$os.'一键部署列表成功', 'addtime' => date("Y-m-d H:i:s")]);
-            return json(['code'=>0,'msg'=>'获取最新一键部署列表成功！']);
-        }catch(\Exception $e){
-            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
-        }
-    }
-
-    public function cleancache(){
-        Cache::clear();
-        return json(['code'=>0,'msg'=>'succ']);
-    }
+<?php
+
+namespace app\controller;
+
+use app\BaseController;
+use think\facade\Db;
+use think\facade\View;
+use think\facade\Request;
+use think\facade\Cache;
+use app\lib\Btapi;
+use app\lib\Plugins;
+
+class Admin extends BaseController
+{
+    public function verifycode()
+    {
+        return captcha();
+    }
+
+    public function login(){
+        if(request()->islogin){
+            return redirect('/admin');
+        }
+        if(request()->isAjax()){
+            $username = input('post.username',null,'trim');
+            $password = input('post.password',null,'trim');
+            $code = input('post.code',null,'trim');
+    
+            if(empty($username) || empty($password)){
+                return json(['code'=>-1, 'msg'=>'用户名或密码不能为空']);
+            }
+            if(!captcha_check($code)){
+                return json(['code'=>-1, 'msg'=>'验证码错误']);
+            }
+            if($username == config_get('admin_username') && $password == config_get('admin_password')){
+                Db::name('log')->insert(['uid' => 0, 'action' => '登录后台', 'data' => 'IP:'.$this->clientip, 'addtime' => date("Y-m-d H:i:s")]);
+                $session = md5($username.config_get('admin_password'));
+                $expiretime = time()+2562000;
+                $token = authcode("{$username}\t{$session}\t{$expiretime}", 'ENCODE', config_get('syskey'));
+                cookie('admin_token', $token, ['expire' => $expiretime, 'httponly' => true]);
+                config_set('admin_lastlogin', date('Y-m-d H:i:s'));
+                return json(['code'=>0]);
+            }else{
+                return json(['code'=>-1, 'msg'=>'用户名或密码错误']);
+            }
+        }
+        return view();
+    }
+
+    public function logout()
+    {
+        cookie('admin_token', null);
+        return redirect('/admin/login');
+    }
+
+    public function index()
+    {
+        $stat = ['total'=>0, 'free'=>0, 'pro'=>0, 'ltd'=>0, 'third'=>0];
+        $json_arr = Plugins::get_plugin_list();
+        if($json_arr){
+            foreach($json_arr['list'] as $plugin){
+                $stat['total']++;
+                if($plugin['type']==10) $stat['third']++;
+                elseif($plugin['type']==12) $stat['ltd']++;
+                elseif($plugin['type']==8) $stat['pro']++;
+                elseif($plugin['type']==5 || $plugin['type']==6 || $plugin['type']==7) $stat['free']++;
+            }
+        }
+        $stat['runtime'] = Db::name('config')->where('key','runtime')->value('value') ?? '<font color="red">未运行</font>';
+        $stat['record_total'] = Db::name('record')->count();
+        $stat['record_isuse'] = Db::name('record')->whereTime('usetime', '>=', strtotime('-7 days'))->count();
+        View::assign('stat', $stat);
+
+        $tmp = 'version()';
+        $mysqlVersion = Db::query("select version()")[0][$tmp];
+        $info = [
+            'framework_version' => app()::VERSION,
+            'php_version' => PHP_VERSION,
+            'mysql_version' => $mysqlVersion,
+            'software' => $_SERVER['SERVER_SOFTWARE'],
+            'os' => php_uname(),
+            'date' => date("Y-m-d H:i:s"),
+        ];
+        View::assign('info', $info);
+        return view();
+    }
+
+    public function set(){
+        if(request()->isAjax()){
+            $params = Request::param();
+
+            foreach ($params as $key => $value) {
+                config_set($key, $value);
+            }
+            cache('configs', NULL);
+            return json(['code'=>0]);
+        }
+        $mod = input('param.mod', 'sys');
+        View::assign('mod', $mod);
+        View::assign('conf', config('sys'));
+        $runtime = Db::name('config')->where('key','runtime')->value('value') ?? '<font color="red">未运行</font>';
+        View::assign('runtime', $runtime);
+        return view();
+    }
+
+    public function setaccount(){
+        $params = Request::param();
+        if(isset($params['username']))$params['username']=trim($params['username']);
+        if(isset($params['oldpwd']))$params['oldpwd']=trim($params['oldpwd']);
+        if(isset($params['newpwd']))$params['newpwd']=trim($params['newpwd']);
+        if(isset($params['newpwd2']))$params['newpwd2']=trim($params['newpwd2']);
+
+        if(empty($params['username'])) return json(['code'=>-1, 'msg'=>'用户名不能为空']);
+
+        config_set('admin_username', $params['username']);
+
+        if(!empty($params['oldpwd']) && !empty($params['newpwd']) && !empty($params['newpwd2'])){
+            if(config_get('admin_password') != $params['oldpwd']){
+                return json(['code'=>-1, 'msg'=>'旧密码不正确']);
+            }
+            if($params['newpwd'] != $params['newpwd2']){
+                return json(['code'=>-1, 'msg'=>'两次新密码输入不一致']);
+            }
+            config_set('admin_password', $params['newpwd']);
+        }
+        cache('configs', NULL);
+        cookie('admin_token', null);
+        return json(['code'=>0]);
+    }
+
+    public function testbturl(){
+        $bt_type = input('post.bt_type/d');
+        
+        if($bt_type == 1){
+            $bt_surl = input('post.bt_surl');
+            if(!$bt_surl)return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            $res = get_curl($bt_surl . 'api/SetupCount');
+            if(strpos($res, 'ok')!==false){
+                return json(['code'=>0, 'msg'=>'第三方云端连接测试成功！']);
+            }else{
+                return json(['code'=>-1, 'msg'=>'第三方云端连接测试失败']);
+            }
+        }else{
+            $bt_url = input('post.bt_url');
+            $bt_key = input('post.bt_key');
+            if(!$bt_url || !$bt_key)return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            $btapi = new Btapi($bt_url, $bt_key);
+            $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']:'面板地址无法连接']);
+            }
+        }
+    }
+
+    public function plugins(){
+        $typelist = [];
+        $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);
+        return view();
+    }
+
+    public function pluginswin(){
+        $typelist = [];
+        $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 plugins_data(){
+        $type = input('post.type/d');
+        $keyword = input('post.keyword', null, 'trim');
+        $os = input('get.os');
+        if(!$os) $os = 'Linux';
+
+        $json_arr = Plugins::get_plugin_list($os);
+        if(!$json_arr) return json([]);
+
+        $typelist = [];
+        foreach($json_arr['type'] as $row){
+            $typelist[$row['id']] = $row['title'];
+        }
+
+        $list = [];
+        foreach($json_arr['list'] as $plugin){
+            if($type > 0 && $plugin['type']!=$type) continue;
+            if(!empty($keyword) && $keyword != $plugin['name'] && stripos($plugin['title'], $keyword)===false) continue;
+            $versions = [];
+            foreach($plugin['versions'] as $version){
+                $ver = $version['m_version'].'.'.$version['version'];
+                if(isset($version['download'])){
+                    $status = false;
+                    if(file_exists(get_data_dir().'plugins/other/'.$version['download'])){
+                        $status = true;
+                    }
+                    $versions[] = ['status'=>$status, 'type'=>1, 'version'=>$ver, 'download'=>$version['download'], 'md5'=>$version['md5']];
+                }else{
+                    $status = false;
+                    if(file_exists(get_data_dir($os).'plugins/package/'.$plugin['name'].'-'.$ver.'.zip')){
+                        $status = true;
+                    }
+                    $versions[] = ['status'=>$status, 'type'=>0, 'version'=>$ver];
+                }
+            }
+            if($plugin['name'] == 'obs') $plugin['ps'] = substr($plugin['ps'],0,strpos($plugin['ps'],'<a '));
+            $list[] = [
+                'id' => $plugin['id'],
+                'name' => $plugin['name'],
+                'title' => $plugin['title'],
+                'type' => $plugin['type'],
+                'typename' => $typelist[$plugin['type']],
+                'desc' => str_replace('target="_blank"','target="_blank" rel="noopener noreferrer"',$plugin['ps']),
+                'price' => $plugin['price'],
+                'author' => isset($plugin['author']) ? $plugin['author'] : '官方',
+                'versions' => $versions
+            ];
+        }
+        return json($list);
+    }
+
+    public function download_plugin(){
+        $name = input('post.name', null, 'trim');
+        $version = input('post.version', null, 'trim');
+        $os = input('post.os');
+        if(!$os) $os = 'Linux';
+        if(!$name || !$version) return json(['code'=>-1, 'msg'=>'参数不能为空']);
+        try{
+            Plugins::download_plugin($name, $version, $os);
+            Db::name('log')->insert(['uid' => 0, 'action' => '下载插件', 'data' => $name.'-'.$version.' os:'.$os, 'addtime' => date("Y-m-d H:i:s")]);
+            return json(['code'=>0,'msg'=>'下载成功']);
+        }catch(\Exception $e){
+            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
+        }
+    }
+
+    public function refresh_plugins(){
+        $os = input('get.os');
+        if(!$os) $os = 'Linux';
+        try{
+            Plugins::refresh_plugin_list($os);
+            Db::name('log')->insert(['uid' => 0, 'action' => '刷新插件列表', 'data' => '刷新'.$os.'插件列表成功', 'addtime' => date("Y-m-d H:i:s")]);
+            return json(['code'=>0,'msg'=>'获取最新插件列表成功！']);
+        }catch(\Exception $e){
+            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
+        }
+    }
+
+    public function record(){
+        return view();
+    }
+
+    public function record_data(){
+        $ip = input('post.ip', null, 'trim');
+        $offset = input('post.offset/d');
+        $limit = input('post.limit/d');
+
+        $select = Db::name('record');
+        if(!empty($ip)){
+            $select->where('ip', $ip);
+        }
+        $total = $select->count();
+        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
+
+        return json(['total'=>$total, 'rows'=>$rows]);
+    }
+
+    public function log(){
+        return view();
+    }
+
+    public function log_data(){
+        $action = input('post.action', null, 'trim');
+        $offset = input('post.offset/d');
+        $limit = input('post.limit/d');
+
+        $select = Db::name('log');
+        if(!empty($action)){
+            $select->where('action', $action);
+        }
+        $total = $select->count();
+        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
+
+        return json(['total'=>$total, 'rows'=>$rows]);
+    }
+
+    public function list(){
+        $type = input('param.type', 'black');
+        View::assign('type', $type);
+        View::assign('typename', $type=='white'?'白名单':'黑名单');
+        return view();
+    }
+
+    public function list_data(){
+        $type = input('param.type', 'black');
+        $ip = input('post.ip', null, 'trim');
+        $offset = input('post.offset/d');
+        $limit = input('post.limit/d');
+
+        $tablename = $type == 'black' ? 'black' : 'white';
+        $select = Db::name($tablename);
+        if(!empty($ip)){
+            $select->where('ip', $ip);
+        }
+        $total = $select->count();
+        $rows = $select->order('id','desc')->limit($offset, $limit)->select();
+
+        return json(['total'=>$total, 'rows'=>$rows]);
+    }
+
+    public function list_op(){
+        $type = input('param.type', 'black');
+        $tablename = $type == 'black' ? 'black' : 'white';
+        $act = input('post.act', null);
+        if($act == 'get'){
+            $id = input('post.id/d');
+            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
+            $data = Db::name($tablename)->where('id', $id)->find();
+            return json(['code'=>0, 'data'=>$data]);
+        }elseif($act == 'add'){
+            $ip = input('post.ip', null, 'trim');
+            if(!$ip) return json(['code'=>-1, 'msg'=>'IP不能为空']);
+            if(Db::name($tablename)->where('ip', $ip)->find()){
+                return json(['code'=>-1, 'msg'=>'该IP已存在']);
+            }
+            Db::name($tablename)->insert([
+                'ip' => $ip,
+                'enable' => 1,
+                'addtime' => date("Y-m-d H:i:s")
+            ]);
+            return json(['code'=>0, 'msg'=>'succ']);
+        }elseif($act == 'edit'){
+            $id = input('post.id/d');
+            $ip = input('post.ip', null, 'trim');
+            if(!$id || !$ip) return json(['code'=>-1, 'msg'=>'IP不能为空']);
+            if(Db::name($tablename)->where('ip', $ip)->where('id', '<>', $id)->find()){
+                return json(['code'=>-1, 'msg'=>'该IP已存在']);
+            }
+            Db::name($tablename)->where('id', $id)->update([
+                'ip' => $ip
+            ]);
+            return json(['code'=>0, 'msg'=>'succ']);
+        }elseif($act == 'enable'){
+            $id = input('post.id/d');
+            $enable = input('post.enable/d');
+            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
+            Db::name($tablename)->where('id', $id)->update([
+                'enable' => $enable
+            ]);
+            return json(['code'=>0, 'msg'=>'succ']);
+        }elseif($act == 'del'){
+            $id = input('post.id/d');
+            if(!$id) return json(['code'=>-1, 'msg'=>'no id']);
+            Db::name($tablename)->where('id', $id)->delete();
+            return json(['code'=>0, 'msg'=>'succ']);
+        }
+        return json(['code'=>-1, 'msg'=>'no act']);
+    }
+
+    public function deplist(){
+        $deplist_linux = get_data_dir().'config/deployment_list.json';
+        $deplist_win = get_data_dir('Windows').'config/deployment_list.json';
+        $deplist_linux_time = file_exists($deplist_linux) ? date("Y-m-d H:i:s", filemtime($deplist_linux)) : '不存在';
+        $deplist_win_time = file_exists($deplist_win) ? date("Y-m-d H:i:s", filemtime($deplist_win)) : '不存在';
+        View::assign('deplist_linux_time', $deplist_linux_time);
+        View::assign('deplist_win_time', $deplist_win_time);
+        return view();
+    }
+
+    public function refresh_deplist(){
+        $os = input('get.os');
+        if(!$os) $os = 'Linux';
+        try{
+            Plugins::refresh_deplist($os);
+            Db::name('log')->insert(['uid' => 0, 'action' => '刷新一键部署列表', 'data' => '刷新'.$os.'一键部署列表成功', 'addtime' => date("Y-m-d H:i:s")]);
+            return json(['code'=>0,'msg'=>'获取最新一键部署列表成功！']);
+        }catch(\Exception $e){
+            return json(['code'=>-1, 'msg'=>$e->getMessage()]);
+        }
+    }
+
+    public function cleancache(){
+        Cache::clear();
+        return json(['code'=>0,'msg'=>'succ']);
+    }
 }

app/controller/Api.php

@@ -1,408 +1,394 @@
-<?php
-namespace app\controller;
-
-use think\facade\Db;
-use app\BaseController;
-use app\lib\Plugins;
-
-class Api extends BaseController
-{
-
-    //获取插件列表
-    public function get_plugin_list(){
-        if(!$this->checklist()) return '';
-        $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();
-        if(!$json_arr) return json((object)[]);
-        return json($json_arr);
-    }
-
-    //获取插件列表(win)
-    public function get_plugin_list_win(){
-        if(!$this->checklist()) return '';
-        $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';
-        if(file_exists($json_file)){
-            $data = file_get_contents($json_file);
-            $json_arr = json_decode($data, true);
-            if($json_arr){
-                return json($json_arr);
-            }
-        }
-        return json((object)[]);
-    }
-
-    //下载插件包
-    public function download_plugin(){
-        $plugin_name = input('post.name');
-        $version = input('post.version');
-        $os = input('post.os');
-        if(!$plugin_name || !$version){
-            return '参数不能为空';
-        }
-        if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
-        if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
-            return '参数不正确';
-        }
-        if(!$this->checklist()) '你的服务器被禁止使用此云端';
-        $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 '云端不存在该插件包';
-        }
-    }
-
-    //下载插件主文件
-    public function download_plugin_main(){
-        $plugin_name = input('post.name');
-        $version = input('post.version');
-        $os = input('post.os');
-        if(!$plugin_name || !$version){
-            return '参数不能为空';
-        }
-        if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
-        if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
-            return '参数不正确';
-        }
-        if(!$this->checklist()) '你的服务器被禁止使用此云端';
-        $filepath = get_data_dir($os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
-        if(file_exists($filepath)){
-            $filename = $plugin_name.'_main.py';
-            $this->output_file($filepath, $filename);
-        }else{
-            $filepath = get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
-            if(file_exists($filepath)){
-                $filename = $plugin_name.'_main.py';
-                $this->output_file($filepath, $filename);
-            }else{
-                return '云端不存在该插件主文件';
-            }
-        }
-    }
-
-    //下载插件其他文件
-    public function download_plugin_other(){
-        $fname = input('get.fname');
-        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'=>'你的服务器被禁止使用此云端']);
-        $filepath = get_data_dir().'plugins/other/'.$fname;
-        if(file_exists($filepath)){
-            $filename = basename($fname);
-            $this->output_file($filepath, $filename);
-        }else{
-            return json(['status'=>false, 'msg'=>'云端不存在该插件文件']);
-        }
-    }
-
-    public function get_update_logs(){
-        $type = input('get.type');
-        if($type == 'Windows'){
-            $version = config_get('new_version_win');
-            $data = [
-                [
-                    'title' => 'Linux面板'.$version,
-                    'body' => config_get('update_msg_win'),
-                    'addtime' => config_get('update_date_win')
-                ]
-            ];
-        }else{
-            $version = config_get('new_version');
-            $data = [
-                [
-                    'title' => 'Linux面板'.$version,
-                    'body' => config_get('update_msg'),
-                    'addtime' => config_get('update_date')
-                ]
-            ];
-        }
-        return jsonp($data);
-    }
-
-    public function get_version(){
-        $version = config_get('new_version');
-        return $version;
-    }
-
-    public function get_version_win(){
-        $version = config_get('new_version_win');
-        return $version;
-    }
-
-    //安装统计
-    public function setup_count(){
-        return 'ok';
-    }
-
-    //检测更新
-    public function check_update(){
-        $version = config_get('new_version');
-        $down_url = request()->root(true).'/install/update/LinuxPanel-'.$version.'.zip';
-        $data = [
-            'force' => false,
-            'version' => $version,
-            'downUrl' => $down_url,
-            'updateMsg' => config_get('update_msg'),
-            'uptime' => config_get('update_date'),
-            'is_beta' => 0,
-            'adviser' => -1,
-            'btb' => '',
-            'beta' => [
-                'version' => $version,
-                'downUrl' => $down_url,
-                'updateMsg' => config_get('update_msg'),
-                'uptime' => config_get('update_date'),
-            ]
-        ];
-        return json($data);
-    }
-
-    //检测更新(win)
-    public function check_update_win(){
-        $version = config_get('new_version_win');
-        $down_url = request()->root(true).'/win/panel/panel_'.$version.'.zip';
-        $data = [
-            'force' => false,
-            'version' => $version,
-            'downUrl' => $down_url,
-            'updateMsg' => config_get('update_msg_win'),
-            'uptime' => config_get('update_date_win'),
-            'is_beta' => 0,
-            'py_version' => '3.8.6',
-            'adviser' => -1,
-            'is_rec' => -1,
-            'btb' => '',
-            'beta' => [
-                'py_version' => '3.8.6',
-                'version' => $version,
-                'downUrl' => $down_url,
-                'updateMsg' => config_get('update_msg_win'),
-                'uptime' => config_get('update_date_win'),
-            ]
-        ];
-        return json($data);
-    }
-
-    //宝塔云监控获取最新版本
-    public function btm_latest_version(){
-        $data = [
-            'version' => config_get('new_version_btm'),
-            'description' => config_get('update_msg_btm'),
-            'create_time' => config_get('update_date_btm')
-        ];
-        return json($data);
-    }
-
-    //宝塔云监控更新日志
-    public function btm_update_history(){
-        $data = [
-            [
-                'version' => config_get('new_version_btm'),
-                'description' => config_get('update_msg_btm'),
-                'create_time' => config_get('update_date_btm')
-            ]
-        ];
-        return json($data);
-    }
-
-    //获取内测版更新日志
-    public function get_beta_logs(){
-        return json(['beta_ps'=>'当前暂无内测版', 'list'=>[]]);
-    }
-
-    //检查用户绑定是否正确
-    public function check_auth_key(){
-        return '1';
-    }
-
-    //从云端验证域名是否可访问
-    public function check_domain(){
-        $domain = input('post.domain',null,'trim');
-        $ssl = input('post.ssl/d');
-        if(!$domain) return json(['status'=>false, 'msg'=>'域名不能为空']);
-        if(!strpos($domain,'.')) return json(['status'=>false, 'msg'=>'域名格式不正确']);
-        $domain = str_replace('*.','',$domain);
-        $ip = gethostbyname($domain);
-        if(!$ip || $ip == $domain){
-            return json(['status'=>false, 'msg'=>'无法访问']);
-        }else{
-            return json(['status'=>true, 'msg'=>'访问正常']);
-        }
-    }
-
-    //同步时间
-    public function get_time(){
-        return time();
-    }
-
-    //同步时间
-    public function get_win_date(){
-        return date("Y-m-d H:i:s");
-    }
-
-    //查询是否专业版（废弃）
-    public function is_pro(){
-        return json(['endtime'=>true, 'code'=>1]);
-    }
-
-    //获取产品推荐信息
-    public function get_plugin_remarks(){
-        return json(['list'=>[], 'pro_list'=>[], 'kfqq'=>'', 'kf'=>'', 'qun'=>'']);
-    }
-
-    //获取指定插件评分
-    public function get_plugin_socre(){
-        return json(['total'=>0, 'split'=>[0,0,0,0,0],'page'=>"<div><span class='Pcurrent'>1</span><span class='Pcount'>共计0条数据</span></div>",'data'=>[]]);
-    }
-
-    //提交插件评分
-    public function plugin_score(){
-        return json(['status'=>true, 'msg'=>'您的评分已成功提交，感谢您的支持!']);
-    }
-
-    //获取IP地址
-    public function get_ip_address(){
-        return $this->clientip;
-    }
-
-    //绑定账号
-    public function get_auth_token(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_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];
-        $data = bin2hex(urlencode(json_encode($userinfo)));
-        return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
-    }
-
-    //绑定账号新
-    public function authorization_login(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_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)];
-        $data = bin2hex(urlencode(json_encode($userinfo)));
-        return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
-    }
-
-    //刷新授权信息
-    public function authorization_info(){
-        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
-        $reqData = hex2bin($_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)));
-        return json(['status'=>true, 'data'=>$data]);
-    }
-
-    //一键部署列表
-    public function get_deplist(){
-        $os = input('post.os');
-        $json_arr = Plugins::get_deplist($os);
-        if(!$json_arr) return json([]);
-        return json($json_arr);
-    }
-
-    //获取宝塔SSL列表
-    public function get_ssl_list(){
-        $data = bin2hex('[]');
-        return json(['status'=>true, 'msg'=>'', 'data'=>$data]);
-    }
-
-    public function return_success(){
-        return json(['status'=>true, 'msg'=>1, 'data'=>(object)[]]);
-    }
-
-    public function return_error(){
-        return json(['status'=>false, 'msg'=>'不支持当前操作']);
-    }
-
-    public function return_error2(){
-        return json(['success'=>false, 'res'=>'不支持当前操作']);
-    }
-    
-    public function return_empty(){
-        return '';
-    }
-
-    public function return_empty_array(){
-        return json([]);
-    }
-
-    public function return_page_data(){
-        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 btwaf_getspiders(){
-        $result = cache('btwaf_getspiders');
-        if($result){
-            return json($result);
-        }
-        $bt_url = config_get('bt_url');
-        $bt_key = config_get('bt_key');
-        if(!$bt_url || !$bt_key) return json([]);
-        $btapi = new \app\lib\Btapi($bt_url, $bt_key);
-        $result = $btapi->btwaf_getspiders();
-        if(isset($result['status']) && $result['status']){
-            cache('btwaf_getspiders', $result['data'], 3600 * 24 * 3);
-            return json($result['data']);
-        }
-        return json($result);
-    }
-
-    //检查黑白名单
-    private function checklist(){
-        if(config_get('whitelist') == 1){
-            if(Db::name('white')->where('ip', $this->clientip)->where('enable', 1)->find()){
-                return true;
-            }
-            return false;
-        }else{
-            if(Db::name('black')->where('ip', $this->clientip)->where('enable', 1)->find()){
-                return false;
-            }
-            return true;
-        }
-    }
-
-    //下载大文件
-    private function output_file($filepath, $filename){
-        $filesize = filesize($filepath);
-        $filemd5 = md5_file($filepath);
-
-        ob_clean();
-        header("Content-Type: application/octet-stream");
-        header("Content-Disposition: attachment; filename={$filename}.zip");
-        header("Content-Length: {$filesize}");
-        header("File-size: {$filesize}");
-        header("Content-md5: {$filemd5}");
-
-        $read_buffer = 1024 * 100;
-        $handle = fopen($filepath, 'rb');
-        $sum_buffer = 0;
-        while(!feof($handle) && $sum_buffer<$filesize) {
-            echo fread($handle, min($read_buffer, ($filesize - $sum_buffer) + 1));
-            $sum_buffer += $read_buffer;
-            flush();
-        }
-        fclose($handle);
-        exit;
-    }
+<?php
+namespace app\controller;
+
+use think\facade\Db;
+use app\BaseController;
+use app\lib\Plugins;
+
+class Api extends BaseController
+{
+
+    //获取插件列表
+    public function get_plugin_list(){
+        if(!$this->checklist()) return '';
+        $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();
+        if(!$json_arr) return json((object)[]);
+        return json($json_arr);
+    }
+
+    //获取插件列表(win)
+    public function get_plugin_list_win(){
+        if(!$this->checklist()) return '';
+        $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('Windows');
+        if(!$json_arr) return json((object)[]);
+        return json($json_arr);
+    }
+
+    //下载插件包
+    public function download_plugin(){
+        $plugin_name = input('post.name');
+        $version = input('post.version');
+        $os = input('post.os');
+        if(!$plugin_name || !$version){
+            return '参数不能为空';
+        }
+        if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
+        if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
+            return '参数不正确';
+        }
+        if(!$this->checklist()) '你的服务器被禁止使用此云端';
+        $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 '云端不存在该插件包';
+        }
+    }
+
+    //下载插件主文件
+    public function download_plugin_main(){
+        $plugin_name = input('post.name');
+        $version = input('post.version');
+        $os = input('post.os');
+        if(!$plugin_name || !$version){
+            return '参数不能为空';
+        }
+        if(!in_array($os,['Windows','Linux'])) $os = 'Linux';
+        if(!preg_match('/^[a-zA-Z0-9_]+$/', $plugin_name) || !preg_match('/^[0-9.]+$/', $version)){
+            return '参数不正确';
+        }
+        if(!$this->checklist()) '你的服务器被禁止使用此云端';
+        $filepath = get_data_dir($os).'plugins/main/'.$plugin_name.'-'.$version.'.dat';
+        if(file_exists($filepath)){
+            $filename = $plugin_name.'_main.py';
+            $this->output_file($filepath, $filename);
+        }else{
+            $filepath = get_data_dir($os).'plugins/folder/'.$plugin_name.'-'.$version.'/'.$plugin_name.'/'.$plugin_name.'_main.py';
+            if(file_exists($filepath)){
+                $filename = $plugin_name.'_main.py';
+                $this->output_file($filepath, $filename);
+            }else{
+                return '云端不存在该插件主文件';
+            }
+        }
+    }
+
+    //下载插件其他文件
+    public function download_plugin_other(){
+        $fname = input('get.fname');
+        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'=>'你的服务器被禁止使用此云端']);
+        $filepath = get_data_dir().'plugins/other/'.$fname;
+        if(file_exists($filepath)){
+            $filename = basename($fname);
+            $this->output_file($filepath, $filename);
+        }else{
+            return json(['status'=>false, 'msg'=>'云端不存在该插件文件']);
+        }
+    }
+
+    public function get_update_logs(){
+        $type = input('get.type');
+        if($type == 'Windows'){
+            $version = config_get('new_version_win');
+            $data = [
+                [
+                    'title' => 'Linux面板'.$version,
+                    'body' => config_get('update_msg_win'),
+                    'addtime' => config_get('update_date_win')
+                ]
+            ];
+        }else{
+            $version = config_get('new_version');
+            $data = [
+                [
+                    'title' => 'Linux面板'.$version,
+                    'body' => config_get('update_msg'),
+                    'addtime' => config_get('update_date')
+                ]
+            ];
+        }
+        return jsonp($data);
+    }
+
+    public function get_version(){
+        $version = config_get('new_version');
+        return $version;
+    }
+
+    public function get_version_win(){
+        $version = config_get('new_version_win');
+        return $version;
+    }
+
+    //安装统计
+    public function setup_count(){
+        return 'ok';
+    }
+
+    //检测更新
+    public function check_update(){
+        $version = config_get('new_version');
+        $down_url = request()->root(true).'/install/update/LinuxPanel-'.$version.'.zip';
+        $data = [
+            'force' => false,
+            'version' => $version,
+            'downUrl' => $down_url,
+            'updateMsg' => config_get('update_msg'),
+            'uptime' => config_get('update_date'),
+            'is_beta' => 0,
+            'adviser' => -1,
+            'btb' => '',
+            'beta' => [
+                'version' => $version,
+                'downUrl' => $down_url,
+                'updateMsg' => config_get('update_msg'),
+                'uptime' => config_get('update_date'),
+            ]
+        ];
+        return json($data);
+    }
+
+    //检测更新(win)
+    public function check_update_win(){
+        $version = config_get('new_version_win');
+        $down_url = request()->root(true).'/win/panel/panel_'.$version.'.zip';
+        $data = [
+            'force' => false,
+            'version' => $version,
+            'downUrl' => $down_url,
+            'updateMsg' => config_get('update_msg_win'),
+            'uptime' => config_get('update_date_win'),
+            'is_beta' => 0,
+            'py_version' => '3.8.6',
+            'adviser' => -1,
+            'is_rec' => -1,
+            'btb' => '',
+            'beta' => [
+                'py_version' => '3.8.6',
+                'version' => $version,
+                'downUrl' => $down_url,
+                'updateMsg' => config_get('update_msg_win'),
+                'uptime' => config_get('update_date_win'),
+            ]
+        ];
+        return json($data);
+    }
+
+    //宝塔云监控获取最新版本
+    public function btm_latest_version(){
+        $data = [
+            'version' => config_get('new_version_btm'),
+            'description' => config_get('update_msg_btm'),
+            'create_time' => config_get('update_date_btm')
+        ];
+        return json($data);
+    }
+
+    //宝塔云监控更新日志
+    public function btm_update_history(){
+        $data = [
+            [
+                'version' => config_get('new_version_btm'),
+                'description' => config_get('update_msg_btm'),
+                'create_time' => config_get('update_date_btm')
+            ]
+        ];
+        return json($data);
+    }
+
+    //获取内测版更新日志
+    public function get_beta_logs(){
+        return json(['beta_ps'=>'当前暂无内测版', 'list'=>[]]);
+    }
+
+    //检查用户绑定是否正确
+    public function check_auth_key(){
+        return '1';
+    }
+
+    //从云端验证域名是否可访问
+    public function check_domain(){
+        $domain = input('post.domain',null,'trim');
+        $ssl = input('post.ssl/d');
+        if(!$domain) return json(['status'=>false, 'msg'=>'域名不能为空']);
+        if(!strpos($domain,'.')) return json(['status'=>false, 'msg'=>'域名格式不正确']);
+        $domain = str_replace('*.','',$domain);
+        $ip = gethostbyname($domain);
+        if(!$ip || $ip == $domain){
+            return json(['status'=>false, 'msg'=>'无法访问']);
+        }else{
+            return json(['status'=>true, 'msg'=>'访问正常']);
+        }
+    }
+
+    //同步时间
+    public function get_time(){
+        return time();
+    }
+
+    //同步时间
+    public function get_win_date(){
+        return date("Y-m-d H:i:s");
+    }
+
+    //查询是否专业版（废弃）
+    public function is_pro(){
+        return json(['endtime'=>true, 'code'=>1]);
+    }
+
+    //获取产品推荐信息
+    public function get_plugin_remarks(){
+        return json(['list'=>[], 'pro_list'=>[], 'kfqq'=>'', 'kf'=>'', 'qun'=>'']);
+    }
+
+    //获取指定插件评分
+    public function get_plugin_socre(){
+        return json(['total'=>0, 'split'=>[0,0,0,0,0],'page'=>"<div><span class='Pcurrent'>1</span><span class='Pcount'>共计0条数据</span></div>",'data'=>[]]);
+    }
+
+    //提交插件评分
+    public function plugin_score(){
+        return json(['status'=>true, 'msg'=>'您的评分已成功提交，感谢您的支持!']);
+    }
+
+    //获取IP地址
+    public function get_ip_address(){
+        return $this->clientip;
+    }
+
+    //绑定账号
+    public function get_auth_token(){
+        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        $reqData = hex2bin($_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];
+        $data = bin2hex(urlencode(json_encode($userinfo)));
+        return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
+    }
+
+    //绑定账号新
+    public function authorization_login(){
+        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        $reqData = hex2bin($_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)];
+        $data = bin2hex(urlencode(json_encode($userinfo)));
+        return json(['status'=>true, 'msg'=>'登录成功！', 'data'=>$data]);
+    }
+
+    //刷新授权信息
+    public function authorization_info(){
+        if(!$_POST['data']) return json(['status'=>false, 'msg'=>'参数不能为空']);
+        $reqData = hex2bin($_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)));
+        return json(['status'=>true, 'data'=>$data]);
+    }
+
+    //一键部署列表
+    public function get_deplist(){
+        $os = input('post.os');
+        $json_arr = Plugins::get_deplist($os);
+        if(!$json_arr) return json([]);
+        return json($json_arr);
+    }
+
+    //获取宝塔SSL列表
+    public function get_ssl_list(){
+        $data = bin2hex('[]');
+        return json(['status'=>true, 'msg'=>'', 'data'=>$data]);
+    }
+
+    public function return_success(){
+        return json(['status'=>true, 'msg'=>1, 'data'=>(object)[]]);
+    }
+
+    public function return_error(){
+        return json(['status'=>false, 'msg'=>'不支持当前操作']);
+    }
+
+    public function return_error2(){
+        return json(['success'=>false, 'res'=>'不支持当前操作']);
+    }
+    
+    public function return_empty(){
+        return '';
+    }
+
+    public function return_empty_array(){
+        return json([]);
+    }
+
+    public function return_page_data(){
+        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 btwaf_getspiders(){
+        try{
+            $result = Plugins::btwaf_getspiders();
+            return json($result);
+        }catch(\Exception $e){
+            return json(['status'=>false, 'msg'=>$e->getMessage()]);
+        }
+    }
+
+    //检查黑白名单
+    private function checklist(){
+        if(config_get('whitelist') == 1){
+            if(Db::name('white')->where('ip', $this->clientip)->where('enable', 1)->find()){
+                return true;
+            }
+            return false;
+        }else{
+            if(Db::name('black')->where('ip', $this->clientip)->where('enable', 1)->find()){
+                return false;
+            }
+            return true;
+        }
+    }
+
+    //下载大文件
+    private function output_file($filepath, $filename){
+        $filesize = filesize($filepath);
+        $filemd5 = md5_file($filepath);
+
+        ob_clean();
+        header("Content-Type: application/octet-stream");
+        header("Content-Disposition: attachment; filename={$filename}.zip");
+        header("Content-Length: {$filesize}");
+        header("File-size: {$filesize}");
+        header("Content-md5: {$filemd5}");
+
+        $read_buffer = 1024 * 100;
+        $handle = fopen($filepath, 'rb');
+        $sum_buffer = 0;
+        while(!feof($handle) && $sum_buffer<$filesize) {
+            echo fread($handle, min($read_buffer, ($filesize - $sum_buffer) + 1));
+            $sum_buffer += $read_buffer;
+            flush();
+        }
+        fclose($handle);
+        exit;
+    }
 }

app/lib/BtPlugins.php

@@ -0,0 +1,282 @@
+<?php
+
+namespace app\lib;
+
+use Exception;
+use ZipArchive;
+
+class BtPlugins
+{
+    private $btapi;
+    private $os;
+    
+    //需屏蔽的插件名称列表
+    private static $block_plugins = ['dns'];
+
+    public function __construct($os){
+        $this->os = $os;
+        if($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('获取插件列表失败：插件列表为空');
+            }
+            foreach($result['list'] as $k=>$v){
+                if(in_array($v['name'], self::$block_plugins)) unset($result['list'][$k]);
+            }
+            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)
+                    {
+                        $zip->extractTo(get_data_dir($this->os).'plugins/folder/'.$plugin_name.'-'.$version);
+                        $zip->close();
+                        $main_filepath = get_data_dir($this->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文件，需要解密
+                                $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();
+                            }
+                        }
+                    }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) && 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('解密插件主程序文件失败，获取用户信息失败');
+        }
+    }
+
+    //去除插件主程序文件授权校验
+    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('\'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/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);
+
+        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']:'获取失败');
+        }
+    }
+
+}

app/lib/Plugins.php

@@ -1,350 +1,154 @@
-<?php
-
-namespace app\lib;
-
-use Exception;
-use ZipArchive;
-
-class Plugins
-{
-
-    private static function get_btapi($os){
-        if($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('请先配置好宝塔面板接口信息');
-        $btapi = new Btapi($bt_url, $bt_key);
-        return $btapi;
-    }
-
-    //刷新插件列表
-    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'])){
-            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'] = '';
-        $data['beta'] = 0;
-        $data['uid'] = 1;
-        $data['skey'] = '';
-        $list = [];
-        foreach($data['list'] as $plugin){
-            if(isset($plugin['endtime'])) $plugin['endtime'] = 0;
-            $list[] = $plugin;
-        }
-        $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('保存插件列表失败，文件无写入权限');
-        }
-    }
-
-    //获取插件列表
-    public static function get_plugin_list($os = 'Linux'){
-        $json_file = get_data_dir($os).'config/plugin_list.json';
-        if(file_exists($json_file)){
-            $data = file_get_contents($json_file);
-            $json_arr = json_decode($data, true);
-            if($json_arr){
-                return $json_arr;
-            }
-        }
-        return false;
-    }
-
-    //获取一个插件信息
-    public static function get_plugin_info($name, $os = 'Linux'){
-        $json_arr = self::get_plugin_list($os);
-        if(!$json_arr) return null;
-        foreach($json_arr['list'] as $plugin){
-            if($plugin['name'] == $name){
-                return $plugin;
-            }
-        }
-        return null;
-    }
-
-    //下载插件（自动判断是否第三方）
-    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);
-        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);
-        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);
-        $userinfo = $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) && 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('文件打开失败');
-        if(!$src || strpos($src, 'import ')!==false)return 0;
-        $key = 'Z2B87NEAS2BkxTrh';
-        $iv = 'WwadH66EGWpeeTT6';
-        $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) $de_text .= $tmp;
-            }
-        }
-        if(!empty($de_text) && strpos($de_text, 'import ')!==false){
-            file_put_contents($filepath, $de_text);
-            return 1;
-        }
-        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);
-
-        $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);
-
-        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'])){
-            if(empty($result['list']) || empty($result['type'])){
-                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']:'面板连接失败'));
-        }
-    }
-
-    //获取一键部署列表
-    public static function get_deplist($os = 'Linux'){
-        $json_file = get_data_dir($os).'config/deployment_list.json';
-        if(file_exists($json_file)){
-            $data = file_get_contents($json_file);
-            $json_arr = json_decode($data, true);
-            if($json_arr){
-                return $json_arr;
-            }
-        }
-        return false;
-    }
-
+<?php
+
+namespace app\lib;
+
+use Exception;
+use ZipArchive;
+
+class Plugins
+{
+
+    private static function get_btapi($os){
+        if(self::is_third($os)){
+            return new ThirdPlugins($os);
+        }else{
+            return new BtPlugins($os);
+        }
+    }
+
+    private static function is_third($os){
+        $type = $os == 'Windows' ? config_get('wbt_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();
+        self::save_plugin_list($result, $os);
+    }
+
+    //保存插件列表
+    private static function save_plugin_list($data, $os){
+        $data['ip'] = '127.0.0.1';
+        $data['serverid'] = '';
+        $data['beta'] = 0;
+        $data['uid'] = 1;
+        $data['skey'] = '';
+        $list = [];
+        foreach($data['list'] as $plugin){
+            if(isset($plugin['endtime'])) $plugin['endtime'] = 0;
+            $list[] = $plugin;
+        }
+        $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('保存插件列表失败，文件无写入权限');
+        }
+    }
+
+    //获取插件列表
+    public static function get_plugin_list($os = 'Linux'){
+        $json_file = get_data_dir($os).'config/plugin_list.json';
+        if(file_exists($json_file)){
+            $data = file_get_contents($json_file);
+            $json_arr = json_decode($data, true);
+            if($json_arr){
+                return $json_arr;
+            }
+        }
+        return false;
+    }
+
+    //获取一个插件信息
+    public static function get_plugin_info($name, $os = 'Linux'){
+        $json_arr = self::get_plugin_list($os);
+        if(!$json_arr) return null;
+        foreach($json_arr['list'] as $plugin){
+            if($plugin['name'] == $name){
+                return $plugin;
+            }
+        }
+        return null;
+    }
+
+    //下载插件（自动判断是否第三方）
+    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('未找到该插件信息');
+        $btapi = self::get_btapi($os);
+        $btapi->download_plugin($plugin_name, $version, $plugin_info);
+    }
+
+    //下载插件主程序文件
+    public static function download_plugin_main($plugin_name, $version, $os = 'Linux'){
+        $btapi = self::get_btapi($os);
+        $btapi->download_plugin_main($plugin_name, $version);
+    }
+
+    //本地解密插件主程序文件
+    public static function decode_plugin_main_local($main_filepath, $os = 'Linux'){
+        $btapi = new BtPlugins($os);
+        return $btapi->decode_plugin_main_local($main_filepath);
+    }
+
+    //本地解密模块文件
+    public static function decode_module_file($filepath){
+        $src = file_get_contents($filepath);
+        if($src===false)throw new Exception('文件打开失败');
+        if(!$src || strpos($src, 'import ')!==false)return 0;
+        $key = 'Z2B87NEAS2BkxTrh';
+        $iv = 'WwadH66EGWpeeTT6';
+        $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) $de_text .= $tmp;
+            }
+        }
+        if(!empty($de_text) && strpos($de_text, 'import ')!==false){
+            file_put_contents($filepath, $de_text);
+            return 1;
+        }
+        return 2;
+    }
+
+    //刷新一键部署列表
+    public static function refresh_deplist($os = 'Linux'){
+        $btapi = self::get_btapi($os);
+        $result = $btapi->get_deplist();
+        $json_file = get_data_dir($os).'config/deployment_list.json';
+        if(!file_put_contents($json_file, json_encode($result))){
+            throw new Exception('保存一键部署列表失败，文件无写入权限');
+        }
+    }
+
+    //获取一键部署列表
+    public static function get_deplist($os = 'Linux'){
+        $json_file = get_data_dir($os).'config/deployment_list.json';
+        if(file_exists($json_file)){
+            $data = file_get_contents($json_file);
+            $json_arr = json_decode($data, true);
+            if($json_arr){
+                return $json_arr;
+            }
+        }
+        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;
+    }
+
 }

app/lib/ThirdPlugins.php

@@ -0,0 +1,203 @@
+<?php
+
+namespace app\lib;
+
+use Exception;
+use ZipArchive;
+
+class ThirdPlugins
+{
+    private $url;
+    private $os;
+
+    public function __construct($os)
+    {
+        $this->os = $os;
+        $url = $os == 'Windows' ? config_get('wbt_surl') : config_get('bt_surl');
+        if(!$url) throw new Exception('请先配置好第三方云端首页URL');
+        $this->url = $url;
+    }
+
+    //获取插件列表
+    public function get_plugin_list()
+    {
+        $url = $this->os == 'Windows' ? $this->url . 'api/wpanel/get_soft_list' : $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->extractTo(get_data_dir($this->os).'plugins/folder/'.$plugin_name.'-'.$version);
+                    $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;
+        }
+    }
+
+    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/script/convert.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-Linux_Version="8.0.1"
+Linux_Version="8.0.2"
 Windows_Version="7.9.0"
-Btm_Version="2.2.8"
+Btm_Version="2.2.9"
 
 FILES=(
 public/install/src/panel6.zip

app/view/admin/layout.html

@@ -1,73 +1,74 @@
-<!DOCTYPE html>
-<html lang="zh-cn">
-<head>
-  <meta charset="utf-8" />
-  <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="//cdn.staticfile.org/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="//cdn.staticfile.org/jquery/2.1.4/jquery.min.js"></script>
-  <script src="//cdn.staticfile.org/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="//cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-  <nav class="navbar navbar-fixed-top navbar-default">
-    <div class="container">
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
-          aria-expanded="false" aria-controls="navbar">
-          <span class="sr-only">导航按钮</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="./">宝塔第三方云端管理中心</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')}">
-            <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('deplist')}"><a href="/admin/deplist">一键部署列表</a></li>
-            </ul>
-          </li>
-          <li class="{:checkIfActive('record')}">
-            <a href="/admin/record"><i class="fa fa-list"></i> 使用记录</a>
-          </li>
-          <li class="{:checkIfActive('list')}">
-            <a href="/admin/list"><i class="fa fa-globe"></i> 黑白名单</a>
-          </li>
-          <li class="{:checkIfActive('log')}">
-            <a href="/admin/log"><i class="fa fa-calendar"></i> 操作日志</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/mod/task">定时任务设置</a></li>
-              <li><a href="/admin/set/mod/tools">批量替换工具</a></li>
-              <li><a href="/admin/set/mod/account">管理账号设置</a></li>
-            </ul>
-          </li>
-          <li>
-            <a href="/admin/logout" onclick="return confirm('确定退出登录吗？')"><i class="fa fa-power-off"></i> 退出登录</a>
-          </li>
-        </ul>
-      </div><!-- /.navbar-collapse -->
-    </div><!-- /.container -->
-  </nav><!-- /.navbar -->
-  {block name="main"}主内容{/block}
-</body>
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+  <meta charset="utf-8" />
+  <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="//cdn.staticfile.org/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="//cdn.staticfile.org/jquery/2.1.4/jquery.min.js"></script>
+  <script src="//cdn.staticfile.org/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="//cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+  <nav class="navbar navbar-fixed-top navbar-default">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
+          aria-expanded="false" aria-controls="navbar">
+          <span class="sr-only">导航按钮</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="./">宝塔第三方云端管理中心</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')}">
+            <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('deplist')}"><a href="/admin/deplist">一键部署列表</a></li>
+            </ul>
+          </li>
+          <li class="{:checkIfActive('record')}">
+            <a href="/admin/record"><i class="fa fa-list"></i> 使用记录</a>
+          </li>
+          <li class="{:checkIfActive('list')}">
+            <a href="/admin/list"><i class="fa fa-globe"></i> 黑白名单</a>
+          </li>
+          <li class="{:checkIfActive('log')}">
+            <a href="/admin/log"><i class="fa fa-calendar"></i> 操作日志</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/mod/api">面板接口设置</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>
+          <li>
+            <a href="/admin/logout" onclick="return confirm('确定退出登录吗？')"><i class="fa fa-power-off"></i> 退出登录</a>
+          </li>
+        </ul>
+      </div><!-- /.navbar-collapse -->
+    </div><!-- /.container -->
+  </nav><!-- /.navbar -->
+  {block name="main"}主内容{/block}
+</body>
 </html>

app/view/admin/list.html

@@ -1,209 +1,209 @@
-{extend name="admin/layout" /}
-{block name="title"}黑白名单{/block}
-{block name="main"}
-<style>
-.alert{margin-bottom: 5px;}
-</style>
-<div class="container" style="padding-top:70px;">
-	<div class="col-xs-12 col-md-10 center-block" style="float: none;">
-
-<ul class="nav nav-tabs">
-	<li class="{if $type=='black'}active{/if}"><a href="/admin/list">黑名单列表</a></li><li class="{if $type=='white'}active{/if}"><a href="/admin/list/type/white">白名单列表</a></li>
-</ul>
-
-{if $type=='black' && config_get('whitelist')=='1'}
-<div class="alert alert-warning">提示：当前为白名单模式，黑名单列表里面的记录不会生效。</div>
-{/if}
-{if $type=='white' && config_get('whitelist')=='0'}
-<div class="alert alert-warning">提示：当前未开启白名单模式，白名单列表里面的记录不会生效。</div>
-{/if}
-{if $type=='black'}
-<div class="alert alert-info">添加到黑名单列表中的服务器IP将无法使用此云端</div>
-{/if}
-{if $type=='white'}
-<div class="alert alert-info">只有添加到白名单列表中的服务器IP才可以使用此云端</div>
-{/if}
-
-<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="ip" placeholder="服务器IP">
-  </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:add_item()" class="btn btn-success"><i class="fa fa-plus"></i>添加</a>&nbsp;
-  </div>
-</form>
-</div>
-
-      <table id="listTable">
-	  </table>
-	</div>
-  </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
-<script>
-function setEnable(id,enable) {
-	$.ajax({
-		type : 'POST',
-		url : '/admin/list_op/type/{$type}',
-		data: { act:'enable', id:id, enable:enable},
-		dataType : 'json',
-		success : function(data) {
-			if(data.code == 0){
-				searchSubmit();
-			}else{
-				layer.msg(data.msg, {icon:2, time:1500});
-			}
-		},
-		error:function(data){
-			layer.msg('服务器错误');
-		}
-	});
-}
-
-function add_item(){
-	layer.open({
-		area: ['360px'],
-		title: '添加IP{$typename}',
-		content: '<div class="form-group"><input type="text" class="form-control" name="item_input" placeholder="请输入服务器IP" value=""></div>',
-		yes: function(){
-			var ip = $("input[name='item_input']").val();
-			$.ajax({
-				type : 'POST',
-				url : '/admin/list_op/type/{$type}',
-				data: { act:'add', ip:ip},
-				dataType : 'json',
-				success : function(data) {
-					if(data.code == 0){
-						layer.msg('添加成功', {icon:1, time:800});
-						searchSubmit();
-					}else{
-						layer.alert(data.msg, {icon: 2});
-					}
-				},
-				error:function(data){
-					layer.msg('服务器错误');
-				}
-			});
-		},
-		shadeClose: true
-	});
-}
-
-function edit_item(id){
-	$.ajax({
-		type : 'POST',
-		url : '/admin/list_op/type/{$type}',
-		data: { act:'get', id:id},
-		dataType : 'json',
-		success : function(data) {
-			if(data.code == 0){
-				layer.open({
-					area: ['360px'],
-					title: '编辑IP{$typename}',
-					content: '<div class="form-group"><input type="text" class="form-control" name="item_input" placeholder="请输入服务器IP" value="'+data.data.ip+'"></div>',
-					yes: function(){
-						var ip = $("input[name='item_input']").val();
-						$.ajax({
-							type : 'POST',
-							url : '/admin/list_op/type/{$type}',
-							data: { act:'edit', id:id, ip:ip},
-							dataType : 'json',
-							success : function(data) {
-								if(data.code == 0){
-									layer.msg('修改成功', {icon:1, time:800});
-									searchSubmit();
-								}else{
-									layer.alert(data.msg, {icon: 2});
-								}
-							},
-							error:function(data){
-								layer.msg('服务器错误');
-							}
-						});
-					},
-					shadeClose: true
-				});
-			}else{
-				layer.alert(data.msg, {icon: 2});
-			}
-		},
-		error:function(data){
-			layer.msg('服务器错误');
-		}
-	});
-}
-
-function del_item(id) {
-	if(confirm('是否确定删除此记录？')){
-		$.ajax({
-			type : 'POST',
-			url : '/admin/list_op/type/{$type}',
-			data: { act:'del', id:id},
-			dataType : 'json',
-			success : function(data) {
-				if(data.code == 0){
-					layer.msg('删除成功！', {icon:1, time:800});
-					searchSubmit();
-				}else{
-					layer.alert(data.msg, {icon:2});
-				}
-			},
-			error:function(data){
-				layer.msg('服务器错误');
-			}
-		});
-	}
-}
-
-$(document).ready(function(){
-	updateToolbar();
-	const defaultPageSize = 15;
-	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
-	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
-
-	$("#listTable").bootstrapTable({
-		url: '/admin/list_data/type/{$type}',
-		pageNumber: pageNumber,
-		pageSize: pageSize,
-		classes: 'table table-striped table-hover table-bottom-border',
-		columns: [
-			{
-				field: 'id',
-				title: 'ID',
-				formatter: function(value, row, index) {
-					return '<b>'+value+'</b>';
-				}
-			},
-			{
-				field: 'ip',
-				title: '服务器IP'
-			},
-			{
-				field: 'enable',
-				title: '是否生效',
-				formatter: function(value, row, index) {
-					return value?'<a href="javascript:setEnable('+row.id+',0)"><font color=green><i class="fa fa-check-circle"></i>已生效</font></a>':'<a href="javascript:setEnable('+row.id+',1)"><font color=red><i class="fa fa-times-circle"></i>未生效</font></a>';
-				}
-			},
-			{
-				field: 'addtime',
-				title: '添加时间'
-			},
-			{
-				field: '',
-				title: '操作',
-				formatter: function(value, row, index) {
-					return '<a href="javascript:edit_item('+row.id+')" class="btn btn-xs btn-info">编辑</a>&nbsp;<a href="javascript:del_item('+row.id+')" class="btn btn-xs btn-danger">删除</a>';
-				},
-			},
-		],
-	})
-})
-</script>
+{extend name="admin/layout" /}
+{block name="title"}黑白名单{/block}
+{block name="main"}
+<style>
+.alert{margin-bottom: 5px;}
+</style>
+<div class="container" style="padding-top:70px;">
+	<div class="col-xs-12 col-md-10 center-block" style="float: none;">
+
+<ul class="nav nav-tabs">
+	<li class="{if $type=='black'}active{/if}"><a href="/admin/list">黑名单列表</a></li><li class="{if $type=='white'}active{/if}"><a href="/admin/list/type/white">白名单列表</a></li>
+</ul>
+
+{if $type=='black' && config_get('whitelist')=='1'}
+<div class="alert alert-warning">提示：当前为白名单模式，黑名单列表里面的记录不会生效。</div>
+{/if}
+{if $type=='white' && config_get('whitelist')=='0'}
+<div class="alert alert-warning">提示：当前未开启白名单模式，白名单列表里面的记录不会生效。</div>
+{/if}
+{if $type=='black'}
+<div class="alert alert-info">添加到黑名单列表中的服务器IP将无法使用此云端</div>
+{/if}
+{if $type=='white'}
+<div class="alert alert-info">只有添加到白名单列表中的服务器IP才可以使用此云端</div>
+{/if}
+
+<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="ip" placeholder="服务器IP">
+  </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:add_item()" class="btn btn-success"><i class="fa fa-plus"></i> 添加</a>&nbsp;
+  </div>
+</form>
+</div>
+
+      <table id="listTable">
+	  </table>
+	</div>
+  </div>
+<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
+<script>
+function setEnable(id,enable) {
+	$.ajax({
+		type : 'POST',
+		url : '/admin/list_op/type/{$type}',
+		data: { act:'enable', id:id, enable:enable},
+		dataType : 'json',
+		success : function(data) {
+			if(data.code == 0){
+				searchSubmit();
+			}else{
+				layer.msg(data.msg, {icon:2, time:1500});
+			}
+		},
+		error:function(data){
+			layer.msg('服务器错误');
+		}
+	});
+}
+
+function add_item(){
+	layer.open({
+		area: ['360px'],
+		title: '添加IP{$typename}',
+		content: '<div class="form-group"><input type="text" class="form-control" name="item_input" placeholder="请输入服务器IP" value=""></div>',
+		yes: function(){
+			var ip = $("input[name='item_input']").val();
+			$.ajax({
+				type : 'POST',
+				url : '/admin/list_op/type/{$type}',
+				data: { act:'add', ip:ip},
+				dataType : 'json',
+				success : function(data) {
+					if(data.code == 0){
+						layer.msg('添加成功', {icon:1, time:800});
+						searchSubmit();
+					}else{
+						layer.alert(data.msg, {icon: 2});
+					}
+				},
+				error:function(data){
+					layer.msg('服务器错误');
+				}
+			});
+		},
+		shadeClose: true
+	});
+}
+
+function edit_item(id){
+	$.ajax({
+		type : 'POST',
+		url : '/admin/list_op/type/{$type}',
+		data: { act:'get', id:id},
+		dataType : 'json',
+		success : function(data) {
+			if(data.code == 0){
+				layer.open({
+					area: ['360px'],
+					title: '编辑IP{$typename}',
+					content: '<div class="form-group"><input type="text" class="form-control" name="item_input" placeholder="请输入服务器IP" value="'+data.data.ip+'"></div>',
+					yes: function(){
+						var ip = $("input[name='item_input']").val();
+						$.ajax({
+							type : 'POST',
+							url : '/admin/list_op/type/{$type}',
+							data: { act:'edit', id:id, ip:ip},
+							dataType : 'json',
+							success : function(data) {
+								if(data.code == 0){
+									layer.msg('修改成功', {icon:1, time:800});
+									searchSubmit();
+								}else{
+									layer.alert(data.msg, {icon: 2});
+								}
+							},
+							error:function(data){
+								layer.msg('服务器错误');
+							}
+						});
+					},
+					shadeClose: true
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2});
+			}
+		},
+		error:function(data){
+			layer.msg('服务器错误');
+		}
+	});
+}
+
+function del_item(id) {
+	if(confirm('是否确定删除此记录？')){
+		$.ajax({
+			type : 'POST',
+			url : '/admin/list_op/type/{$type}',
+			data: { act:'del', id:id},
+			dataType : 'json',
+			success : function(data) {
+				if(data.code == 0){
+					layer.msg('删除成功！', {icon:1, time:800});
+					searchSubmit();
+				}else{
+					layer.alert(data.msg, {icon:2});
+				}
+			},
+			error:function(data){
+				layer.msg('服务器错误');
+			}
+		});
+	}
+}
+
+$(document).ready(function(){
+	updateToolbar();
+	const defaultPageSize = 15;
+	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
+	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
+
+	$("#listTable").bootstrapTable({
+		url: '/admin/list_data/type/{$type}',
+		pageNumber: pageNumber,
+		pageSize: pageSize,
+		classes: 'table table-striped table-hover table-bottom-border',
+		columns: [
+			{
+				field: 'id',
+				title: 'ID',
+				formatter: function(value, row, index) {
+					return '<b>'+value+'</b>';
+				}
+			},
+			{
+				field: 'ip',
+				title: '服务器IP'
+			},
+			{
+				field: 'enable',
+				title: '是否生效',
+				formatter: function(value, row, index) {
+					return value?'<a href="javascript:setEnable('+row.id+',0)"><font color=green><i class="fa fa-check-circle"></i>已生效</font></a>':'<a href="javascript:setEnable('+row.id+',1)"><font color=red><i class="fa fa-times-circle"></i>未生效</font></a>';
+				}
+			},
+			{
+				field: 'addtime',
+				title: '添加时间'
+			},
+			{
+				field: '',
+				title: '操作',
+				formatter: function(value, row, index) {
+					return '<a href="javascript:edit_item('+row.id+')" class="btn btn-xs btn-info">编辑</a>&nbsp;<a href="javascript:del_item('+row.id+')" class="btn btn-xs btn-danger">删除</a>';
+				},
+			},
+		],
+	})
+})
+</script>
 {/block}

app/view/admin/log.html

@@ -1,74 +1,74 @@
-{extend name="admin/layout" /}
-{block name="title"}操作日志{/block}
-{block name="main"}
-<style>
-</style>
-<div class="container" style="padding-top:70px;">
-	<div class="col-xs-12 col-md-10 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="action" placeholder="操作类型">
-  </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;
-  </div>
-</form>
-</div>
-
-      <table id="listTable">
-	  </table>
-	</div>
-  </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
-<script>
-
-$(document).ready(function(){
-	updateToolbar();
-	const defaultPageSize = 20;
-	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
-	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
-
-	$("#listTable").bootstrapTable({
-		url: '/admin/log_data',
-		pageNumber: pageNumber,
-		pageSize: pageSize,
-		classes: 'table table-striped table-hover table-bottom-border',
-		columns: [
-			{
-				field: 'id',
-				title: 'ID',
-				formatter: function(value, row, index) {
-					return '<b>'+value+'</b>';
-				}
-			},
-			{
-				field: 'uid',
-				title: '操作人',
-				formatter: function(value, row, index) {
-					return value==1?'<font color="green">定时任务</font>':'<font color="blue">管理员</font>';
-				}
-			},
-			{
-				field: 'action',
-				title: '操作类型'
-			},
-			{
-				field: 'data',
-				title: '操作详情',
-			},
-			{
-				field: 'addtime',
-				title: '操作时间'
-			},
-		],
-	})
-})
-</script>
+{extend name="admin/layout" /}
+{block name="title"}操作日志{/block}
+{block name="main"}
+<style>
+</style>
+<div class="container" style="padding-top:70px;">
+	<div class="col-xs-12 col-md-10 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="action" placeholder="操作类型">
+  </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;
+  </div>
+</form>
+</div>
+
+      <table id="listTable">
+	  </table>
+	</div>
+  </div>
+<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
+<script>
+
+$(document).ready(function(){
+	updateToolbar();
+	const defaultPageSize = 20;
+	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
+	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
+
+	$("#listTable").bootstrapTable({
+		url: '/admin/log_data',
+		pageNumber: pageNumber,
+		pageSize: pageSize,
+		classes: 'table table-striped table-hover table-bottom-border',
+		columns: [
+			{
+				field: 'id',
+				title: 'ID',
+				formatter: function(value, row, index) {
+					return '<b>'+value+'</b>';
+				}
+			},
+			{
+				field: 'uid',
+				title: '操作人',
+				formatter: function(value, row, index) {
+					return value==1?'<font color="green">定时任务</font>':'<font color="blue">管理员</font>';
+				}
+			},
+			{
+				field: 'action',
+				title: '操作类型'
+			},
+			{
+				field: 'data',
+				title: '操作详情',
+			},
+			{
+				field: 'addtime',
+				title: '操作时间'
+			},
+		],
+	})
+})
+</script>
 {/block}

app/view/admin/plugins.html

@@ -1,214 +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/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>
-			</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;
-    <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="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/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},
-		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',
-            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 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',
-		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){
-                        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
-				}
-			},
-		],
-	})
-})
-</script>
+{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/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="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/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},
+		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',
+            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},
+		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',
+		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){
+                        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){
+                            $.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

@@ -1,214 +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/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>
-			</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;
-    <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="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/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:'Windows'},
-		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=Windows',
-            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 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=Windows',
-		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){
-                        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
-				}
-			},
-		],
-	})
-})
-</script>
+{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/win/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="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/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:'Windows'},
+		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=Windows',
+            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},
+		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=Windows',
+		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){
+                        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){
+                            $.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/record.html

@@ -1,67 +1,67 @@
-{extend name="admin/layout" /}
-{block name="title"}使用记录{/block}
-{block name="main"}
-<style>
-</style>
-<div class="container" style="padding-top:70px;">
-	<div class="col-xs-12 col-md-10 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="ip" placeholder="服务器IP">
-  </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;
-  </div>
-</form>
-</div>
-
-      <table id="listTable">
-	  </table>
-	</div>
-  </div>
-<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
-<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
-<script>
-
-$(document).ready(function(){
-	updateToolbar();
-	const defaultPageSize = 15;
-	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
-	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
-
-	$("#listTable").bootstrapTable({
-		url: '/admin/record_data',
-		pageNumber: pageNumber,
-		pageSize: pageSize,
-		classes: 'table table-striped table-hover table-bottom-border',
-		columns: [
-			{
-				field: 'id',
-				title: 'ID',
-				formatter: function(value, row, index) {
-					return '<b>'+value+'</b>';
-				}
-			},
-			{
-				field: 'ip',
-				title: '服务器IP'
-			},
-			{
-				field: 'addtime',
-				title: '首次安装时间',
-			},
-			{
-				field: 'usetime',
-				title: '最后使用时间'
-			},
-		],
-	})
-})
-</script>
+{extend name="admin/layout" /}
+{block name="title"}使用记录{/block}
+{block name="main"}
+<style>
+</style>
+<div class="container" style="padding-top:70px;">
+	<div class="col-xs-12 col-md-10 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="ip" placeholder="服务器IP">
+  </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;
+  </div>
+</form>
+</div>
+
+      <table id="listTable">
+	  </table>
+	</div>
+  </div>
+<script src="//cdn.staticfile.org/layer/3.5.1/layer.js"></script>
+<script src="//cdn.staticfile.org/bootstrap-table/1.20.2/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="/static/js/custom.js"></script>
+<script>
+
+$(document).ready(function(){
+	updateToolbar();
+	const defaultPageSize = 15;
+	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
+	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
+
+	$("#listTable").bootstrapTable({
+		url: '/admin/record_data',
+		pageNumber: pageNumber,
+		pageSize: pageSize,
+		classes: 'table table-striped table-hover table-bottom-border',
+		columns: [
+			{
+				field: 'id',
+				title: 'ID',
+				formatter: function(value, row, index) {
+					return '<b>'+value+'</b>';
+				}
+			},
+			{
+				field: 'ip',
+				title: '服务器IP'
+			},
+			{
+				field: 'addtime',
+				title: '首次安装时间',
+			},
+			{
+				field: 'usetime',
+				title: '最后使用时间'
+			},
+		],
+	})
+})
+</script>
 {/block}

app/view/admin/set.html

@@ -1,344 +1,451 @@
-{extend name="admin/layout" /}
-{block name="title"}系统设置{/block}
-{block name="main"}
-<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-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><br/>
-	  <select class="form-control" name="whitelist" default="{:config_get('whitelist')}"><option value="0">关闭</option><option value="1">开启</option></select>
-      <font color="green">开启白名单模式后，只有在<a href="/admin/list/type/white" target="_blank">白名单列表</a>中的服务器IP才能使用此云端</font>
-	</div>
-	<div class="form-group">
-	  <label>安装脚本展示页面开关：</label>
-	  <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">
-      <label>宝塔Linux面板最新版本号：</label>
-      <input type="text" name="new_version" value="{:config_get('new_version')}" class="form-control"/>
-      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/install/update/放置对应版本更新包</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔Linux面板更新日志：</label>
-      <textarea class="form-control" name="update_msg" rows="5" placeholder="支持HTML代码">{:config_get('update_msg')}</textarea>
-      <font color="green">用于检测更新接口返回</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔Linux面板更新日期：</label>
-      <input type="date" name="update_date" value="{:config_get('update_date')}" class="form-control"/>
-	  <font color="green">用于检测更新接口返回</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔Windows面板最新版本号：</label>
-      <input type="text" name="new_version_win" value="{:config_get('new_version_win')}" class="form-control"/>
-      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/win/panel/放置对应版本更新包</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔Windows面板更新日志：</label>
-      <textarea class="form-control" name="update_msg_win" rows="5" placeholder="支持HTML代码">{:config_get('update_msg_win')}</textarea>
-      <font color="green">用于检测更新接口返回</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔Windows面板更新日期：</label>
-      <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">
-      <label>宝塔云监控最新版本号：</label>
-      <input type="text" name="new_version_btm" value="{:config_get('new_version_btm')}" class="form-control"/>
-      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/install/src/放置对应版本更新包</font>
-    </div>
-	<div class="form-group">
-      <label>宝塔云监控更新日志：</label>
-      <textarea class="form-control" name="update_msg_btm" rows="3" placeholder="支持HTML代码">{:config_get('update_msg_btm')}</textarea>
-    </div>
-	<div class="form-group">
-      <label>宝塔云监控更新日期：</label>
-      <input type="date" name="update_date_btm" value="{:config_get('update_date_btm')}" class="form-control"/>
-    </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-primary">
-<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>
-    <p><a href="/static/file/kaixin.zip">下载专用插件(Linux)</a>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
-	<div class="form-group">
-	  <label>宝塔面板URL：</label><br/>
-	  <input type="text" name="bt_url" value="{:config_get('bt_url')}" class="form-control"/>
-      <font color="green">填写规则如：<u>http://192.168.1.1:8888</u> ，不要带其他后缀</font>
-	</div>
-	<div class="form-group">
-	  <label>宝塔面板接口密钥：</label>
-	  <input type="text" name="bt_key" value="{:config_get('bt_key')}" class="form-control"/>
-	</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"/>
-	</div>
-  </form>
-</div>
-</div>
-<div class="panel panel-primary">
-<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>
-    <p><a href="/static/file/win/kaixin.zip">下载专用插件(Win)</a>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
-	<div class="form-group">
-	  <label>宝塔面板URL：</label><br/>
-	  <input type="text" name="wbt_url" value="{:config_get('wbt_url')}" class="form-control"/>
-      <font color="green">填写规则如：<u>http://192.168.1.1:8888</u> ，不要带其他后缀</font>
-	</div>
-	<div class="form-group">
-	  <label>宝塔面板接口密钥：</label>
-	  <input type="text" name="wbt_key" value="{:config_get('wbt_key')}" class="form-control"/>
-	</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"/>
-	</div>
-  </form>
-</div>
-</div>
-</div>
-{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-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>
-    <div class="alert alert-warning">上次运行时间：{$runtime|raw}</div>
-    <div class="list-group-item">php {:app()->getRootPath()}think updateall</div><br/>
-  </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>Linux面板批量下载插件范围：</label><br/>
-	  <select class="form-control" name="updateall_type" default="{:config_get('updateall_type')}"><option value="0">仅免费插件</option><option value="1">免费插件+专业版插件</option><option value="2">免费插件+专业版插件+企业版插件</option></select><font color="green">（批量下载不包含所有第三方插件，第三方插件需要去手动下载。）</font>
-	</div>
-	<div class="form-group">
-	  <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 text-center">
-	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
-	</div>
-  </form>
-</div>
-</div>
-</div>
-{elseif $mod=='account'}
-<div class="col-xs-12 col-sm-8 col-lg-6 center-block" style="float: none;">
-<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="form-group">
-	  <label>用户名：</label><br/>
-	  <input type="text" name="username" value="{:config_get('admin_username')}" class="form-control" required/>
-	</div>
-	<div class="form-group">
-	  <label>旧密码：</label>
-	  <input type="password" name="oldpwd" value="" class="form-control"  placeholder="请输入当前的管理员密码"/>
-	</div>
-    <div class="form-group">
-	  <label>新密码：</label>
-	  <input type="password" name="newpwd" value="" class="form-control"  placeholder="不修改请留空"/>
-	</div>
-    <div class="form-group">
-	  <label>重输密码：</label>
-	  <input type="password" name="newpwd2" value="" class="form-control"  placeholder="不修改请留空"/>
-	</div>
-	<div class="form-group text-center">
-	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
-	</div>
-	<a href="javascript:cleancache()" class="btn btn-default btn-sm btn-block">清理缓存</a>
-  </form>
-</div>
-</div>
-{elseif $mod=='tools'}
-<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">批量替换工具</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;">使用以下命令可以将bt安装包、更新包和脚本文件里面的<code>http://www.example.com</code>批量替换成当前网址<code>{:request()->root(true)}</code>，每次更新版本后只需要执行一次即可。</div>
-    <div class="list-group-item" style="word-break:break-all;">cd {:app()->getRootPath()}app/script && chmod +x convert.sh && ./convert.sh {:app()->getRootPath()} {:request()->root(true)}</div><br/>
-  </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>
-$(document).ready(function(){
-	var items = $("select[default]");
-	for (i = 0; i < items.length; i++) {
-		$(items[i]).val($(items[i]).attr("default")||0);
-	}
-    $("#testbturl").click(function(){
-        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 ii = layer.load(2, {shade:[0.1,'#fff']});
-        $.ajax({
-            type : 'POST',
-            url : '/admin/testbturl',
-            data : {bt_url:bt_url, bt_key:bt_key},
-            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('服务器错误');
-            }
-        });
-    })
-	$("#testbturl2").click(function(){
-        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 ii = layer.load(2, {shade:[0.1,'#fff']});
-        $.ajax({
-            type : 'POST',
-            url : '/admin/testbturl',
-            data : {bt_url:wbt_url, bt_key:wbt_key},
-            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('服务器错误');
-            }
-        });
-    })
-})
-function saveSetting(obj){
-	var ii = layer.load(2, {shade:[0.1,'#fff']});
-	$.ajax({
-		type : 'POST',
-		url : '/admin/set',
-		data : $(obj).serialize(),
-		dataType : 'json',
-		success : function(data) {
-			layer.close(ii);
-			if(data.code == 0){
-				layer.alert('设置保存成功！', {
-					icon: 1,
-					closeBtn: false
-				}, function(){
-				  window.location.reload()
-				});
-			}else{
-				layer.alert(data.msg, {icon: 2})
-			}
-		},
-		error:function(data){
-            layer.close(ii);
-			layer.msg('服务器错误');
-		}
-	});
-	return false;
-}
-function saveAccount(obj){
-	var ii = layer.load(2, {shade:[0.1,'#fff']});
-	$.ajax({
-		type : 'POST',
-		url : '/admin/setaccount',
-		data : $(obj).serialize(),
-		dataType : 'json',
-		success : function(data) {
-			layer.close(ii);
-			if(data.code == 0){
-				layer.alert('管理账号保存成功！请重新登录。', {
-					icon: 1,
-					closeBtn: false
-				}, function(){
-				  window.location.reload()
-				});
-			}else{
-				layer.alert(data.msg, {icon: 2})
-			}
-		},
-		error:function(data){
-            layer.close(ii);
-			layer.msg('服务器错误');
-		}
-	});
-	return false;
-}
-function cleancache(){
-	var ii = layer.load(2, {shade:[0.1,'#fff']});
-	$.ajax({
-		type : 'GET',
-		url : '/admin/cleancache',
-		dataType : 'json',
-		success : function(data) {
-			layer.close(ii);
-			layer.msg('清理缓存成功', {icon: 1});
-		},
-		error:function(data){
-            layer.close(ii);
-			layer.msg('服务器错误');
-		}
-	});
-}
-</script>
+{extend name="admin/layout" /}
+{block name="title"}系统设置{/block}
+{block name="main"}
+<div class="container" style="padding-top:70px;">
+{if $mod=='sys'}
+<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-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form" role="form">
+	<div class="form-group">
+	  <label>是否开启白名单模式：</label><br/>
+	  <select class="form-control" name="whitelist" default="{:config_get('whitelist')}"><option value="0">关闭</option><option value="1">开启</option></select>
+      <font color="green">开启白名单模式后，只有在<a href="/admin/list/type/white" target="_blank">白名单列表</a>中的服务器IP才能使用此云端</font>
+	</div>
+	<div class="form-group">
+	  <label>安装脚本展示页面开关：</label>
+	  <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"/>
+      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/install/update/放置对应版本更新包</font>
+    </div>
+	<div class="form-group">
+      <label>宝塔Linux面板更新日志：</label>
+      <textarea class="form-control" name="update_msg" rows="5" placeholder="支持HTML代码">{:config_get('update_msg')}</textarea>
+      <font color="green">用于检测更新接口返回</font>
+    </div>
+	<div class="form-group">
+      <label>宝塔Linux面板更新日期：</label>
+      <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>
+<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">
+	<div class="form-group">
+      <label>宝塔Windows面板最新版本号：</label>
+      <input type="text" name="new_version_win" value="{:config_get('new_version_win')}" class="form-control"/>
+      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/win/panel/放置对应版本更新包</font>
+    </div>
+	<div class="form-group">
+      <label>宝塔Windows面板更新日志：</label>
+      <textarea class="form-control" name="update_msg_win" rows="5" placeholder="支持HTML代码">{:config_get('update_msg_win')}</textarea>
+      <font color="green">用于检测更新接口返回</font>
+    </div>
+	<div class="form-group">
+      <label>宝塔Windows面板更新日期：</label>
+      <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 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"/>
+      <font color="green">用于一键更新脚本获取最新版本号，以及检测更新接口。并确保已在/public/install/src/放置对应版本更新包</font>
+    </div>
+	<div class="form-group">
+      <label>宝塔云监控更新日志：</label>
+      <textarea class="form-control" name="update_msg_btm" rows="3" placeholder="支持HTML代码">{:config_get('update_msg_btm')}</textarea>
+    </div>
+	<div class="form-group">
+      <label>宝塔云监控更新日期：</label>
+      <input type="date" name="update_date_btm" value="{:config_get('update_date_btm')}" class="form-control"/>
+    </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-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>对接方式：</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/>
+	  <input type="text" name="bt_url" value="{:config_get('bt_url')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://192.168.1.1:8888</u> ，不要带其他后缀</font>
+	</div>
+	<div class="form-group">
+	  <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"/>
+	</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">宝塔Windows面板接口设置</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="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>，在面板【软件商店】->【第三方应用】，点击【导入插件】，导入该专用插件。</p>
+	<div class="form-group">
+	  <label>宝塔面板URL：</label><br/>
+	  <input type="text" name="wbt_url" value="{:config_get('wbt_url')}" class="form-control"/>
+      <font color="green">填写规则如：<u>http://192.168.1.1:8888</u> ，不要带其他后缀</font>
+	</div>
+	<div class="form-group">
+	  <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"/>
+	</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();
+	}
+});
+</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-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>
+    <div class="alert alert-warning">上次运行时间：{$runtime|raw}</div>
+    <div class="list-group-item">php {:app()->getRootPath()}think updateall</div><br/>
+  </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>Linux面板批量下载插件范围：</label><br/>
+	  <select class="form-control" name="updateall_type" default="{:config_get('updateall_type')}"><option value="0">仅免费插件</option><option value="1">免费插件+专业版插件</option><option value="2">免费插件+专业版插件+企业版插件</option></select><font color="green">（批量下载不包含所有第三方插件，第三方插件需要去手动下载。）</font>
+	</div>
+	<div class="form-group">
+	  <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 text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+  </form>
+</div>
+</div>
+</div>
+{elseif $mod=='account'}
+<div class="col-xs-12 col-sm-8 col-lg-6 center-block" style="float: none;">
+<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="form-group">
+	  <label>用户名：</label><br/>
+	  <input type="text" name="username" value="{:config_get('admin_username')}" class="form-control" required/>
+	</div>
+	<div class="form-group">
+	  <label>旧密码：</label>
+	  <input type="password" name="oldpwd" value="" class="form-control"  placeholder="请输入当前的管理员密码"/>
+	</div>
+    <div class="form-group">
+	  <label>新密码：</label>
+	  <input type="password" name="newpwd" value="" class="form-control"  placeholder="不修改请留空"/>
+	</div>
+    <div class="form-group">
+	  <label>重输密码：</label>
+	  <input type="password" name="newpwd2" value="" class="form-control"  placeholder="不修改请留空"/>
+	</div>
+	<div class="form-group text-center">
+	  <input type="submit" name="submit" value="保存" class="btn btn-success btn-block"/>
+	</div>
+	<a href="javascript:cleancache()" class="btn btn-default btn-sm btn-block">清理缓存</a>
+  </form>
+</div>
+</div>
+{elseif $mod=='tools'}
+<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">批量替换工具</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;">使用以下命令可以将bt安装包、更新包和脚本文件里面的<code>http://www.example.com</code>批量替换成当前网址<code>{:request()->root(true)}</code>，每次更新版本后只需要执行一次即可。</div>
+    <div class="list-group-item" style="word-break:break-all;">cd {:app()->getRootPath()}app/script && chmod +x convert.sh && ./convert.sh {:app()->getRootPath()} {:request()->root(true)}</div><br/>
+  </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>
+$(document).ready(function(){
+	var items = $("select[default]");
+	for (i = 0; i < items.length; i++) {
+		$(items[i]).val($(items[i]).attr("default")||0);
+	}
+    $("#testbturl").click(function(){
+		var bt_type = $("select[name=bt_type]").val();
+		if(bt_type == '1'){
+			var bt_surl = $("input[name=bt_surl]").val();
+			if(bt_surl == ''){
+				layer.alert('第三方云端URL不能为空');return;
+			}
+			if(bt_surl.indexOf('http://')==-1 && bt_surl.indexOf('https://')==-1){
+				layer.alert('第三方云端URL不正确');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 = {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 : 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('服务器错误');
+            }
+        });
+    })
+	$("#testbturl2").click(function(){
+		var wbt_type = $("select[name=wbt_type]").val();
+		if(wbt_type == '1'){
+			var wbt_surl = $("input[name=wbt_surl]").val();
+			if(wbt_surl == ''){
+				layer.alert('第三方云端URL不能为空');return;
+			}
+			if(wbt_surl.indexOf('http://')==-1 && wbt_surl.indexOf('https://')==-1){
+				layer.alert('第三方云端URL不正确');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 = {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 : 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('服务器错误');
+            }
+        });
+    })
+})
+function saveSetting(obj){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'POST',
+		url : '/admin/set',
+		data : $(obj).serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert('设置保存成功！', {
+					icon: 1,
+					closeBtn: false
+				}, function(){
+				  window.location.reload()
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+	return false;
+}
+function saveAccount(obj){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'POST',
+		url : '/admin/setaccount',
+		data : $(obj).serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert('管理账号保存成功！请重新登录。', {
+					icon: 1,
+					closeBtn: false
+				}, function(){
+				  window.location.reload()
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+	return false;
+}
+function cleancache(){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'GET',
+		url : '/admin/cleancache',
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			layer.msg('清理缓存成功', {icon: 1});
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+}
+</script>
 {/block}

install.sql

@@ -12,15 +12,15 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
 ('bt_key', ''),
 ('whitelist', '0'),
 ('download_page', '1'),
-('new_version', '8.0.1'),
+('new_version', '8.0.2'),
 ('update_msg', '暂无更新日志'),
-('update_date', '2023-07-20'),
+('update_date', '2023-08-28'),
 ('new_version_win', '7.9.0'),
 ('update_msg_win', '暂无更新日志'),
 ('update_date_win', '2023-07-20'),
-('new_version_btm', '2.2.8'),
+('new_version_btm', '2.2.9'),
 ('update_msg_btm', '暂无更新日志'),
-('update_date_btm', '2023-08-04'),
+('update_date_btm', '2023-08-11'),
 ('updateall_type', '0'),
 ('syskey', 'UqP94LtI8eWAIgCP');
 

public/install/install_6.0.sh

@@ -759,6 +759,18 @@ Install_Bt(){
 	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
+	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
 }
 Set_Bt_Panel(){
 	Run_User="www"
@@ -1022,7 +1034,7 @@ if [ "${PANEL_SSL}" == "True" ];then
 	HTTP_S="https"
 else
 	HTTP_S="http"
-fi 
+fi
 
 echo > /www/server/panel/data/bind.pl
 echo -e "=================================================================="
@@ -1042,7 +1054,6 @@ echo -e " 点击【高级】-【继续访问】或【接受风险并继续】访
 echo -e " 教程：https://www.bt.cn/bbs/thread-117246-1-1.html"
 echo -e "" 
 echo -e "=================================================================="
-
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))
 echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"

public/install/install_btmonitor.sh

@@ -427,6 +427,9 @@ EOF
 	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
 }
 
 Start_Monitor(){

public/install/update6.sh

@@ -113,6 +113,18 @@ 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
+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
 
 chattr -i /etc/init.d/bt
 chmod +x /etc/init.d/bt

public/install/update_btmonitor.sh

@@ -339,6 +339,9 @@ Install_Monitor(){
 	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
 }
 
 Service_Add(){

route/app.php

@@ -105,6 +105,9 @@ Route::group('api', function () {
     Route::post('/v2/common_v1_authorization/get_pricing', 'api/return_error2');
 
     Route::any('/bt_waf/getSpiders', 'api/btwaf_getspiders');
+    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::miss('api/return_error');
 });

wiki/update.md

@@ -1,120 +1,120 @@
-# Linux面板官方更新包修改记录
-
-查询最新版本号：https://www.bt.cn/api/panel/get_version?is_version=1
-
-官方更新包下载链接：http://download.bt.cn/install/update/LinuxPanel-版本号.zip
-
-假设搭建的宝塔第三方云端网址是 http://www.example.com
-
-- 将class文件夹里面所有的.so文件删除
-
-- 将linux/PluginLoader.py复制到class文件夹
-
-- 批量解密模块文件：执行 php think decrypt classdir <面板class文件夹路径>
-
-- 全局搜索替换 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://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
-
-- class/ajax.py 文件 \#是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home')
-
-  class/jobs.py 文件 \#尝试升级到独立环境 下面的 public.get_url() 改成 public.GetConfigValue('home')
-
-  class/system.py 文件 RepPanel和UpdatePro方法内的 public.get_url() 改成 public.GetConfigValue('home')
-
-- 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
-
-  在 def get_improvement(): 这一行下面加上 return False
-
-  在free_login_area方法内get_free_ips_area替换成get_ips_area
-
-  在get_free_ip_info方法内，获取IP的部分改成res = get_ips_area([address])
-
-  在login_send_body方法内，free_login_area(login_ip=server_ip_area的server_ip_area改成login_ip
-
-- class/panelPlugin.py 文件，download_icon方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
-
-  删除public.total_keyword(get.query)这一行
-
-  __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')
-  ```
-
-- class/plugin_deployment.py 文件，SetupPackage方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
-
-- install/install_soft.sh 在bash执行之前加入以下代码
-
-  ```shell
-  sed -i "s/http:\/\/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/" lib.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 文件  删除以下几行
-
-  "check_panel_msg": check_panel_msg,
-
-  PluginLoader.daemon_panel()
-
-- 去除WebRTC连接：BTPanel/static/js/public.js  删除stun.start();这一行
-
-- 去除首页广告：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();
-
-- 删除问卷调查：BTPanel/templates/default/layout.html 删除if(window.localStorage.getItem('panelNPS') == null)以及下面的行
-
-- [可选]去除各种计算题：复制bt.js到 BTPanel/static/ ，在 BTPanel/templates/default/layout.html 的\</body\>前面加入
-
-  ```javascript
-  <script src="/static/bt.js"></script>
-  ```
-
-- [可选]去除创建网站自动创建的垃圾文件：在class/panelSite.py，分别删除
-
-  htaccess = self.sitePath+'/.htaccess'
-
-  index = self.sitePath+'/index.html'
-
-  doc404 = self.sitePath+'/404.html'
-
-  这3行及分别接下来的4行代码
-
-- [可选]关闭未绑定域名提示页面：在class/panelSite.py，root /www/server/nginx/html改成return 400
-
-- [可选]关闭自动生成访问日志：在 BTPanel/\_\_init\_\_.py  删除public.write_request_log()这一行
-
-- [可选]删除小图标广告：在BTPanel/static/js/site.js，删除“WAF防火墙”对应的span标签
-
-- [可选]上传文件默认选中覆盖，在BTPanel/static/js/upload-drog.js，id="all_operation"加checked属性
-
-
-解压安装包panel6.zip，将更新包改好的文件覆盖到里面，然后重新打包，即可更新安装包。（
-
-别忘了删除class文件夹里面所有的.so文件）
-
+# Linux面板官方更新包修改记录
+
+查询最新版本号：https://www.bt.cn/api/panel/get_version?is_version=1
+
+官方更新包下载链接：http://download.bt.cn/install/update/LinuxPanel-版本号.zip
+
+假设搭建的宝塔第三方云端网址是 http://www.example.com
+
+- 将class文件夹里面所有的.so文件删除
+
+- 将linux/PluginLoader.py复制到class文件夹
+
+- 批量解密模块文件：执行 php think decrypt classdir <面板class文件夹路径>
+
+- 全局搜索替换 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://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
+
+- class/ajax.py 文件 \#是否执行升级程序 下面的 public.get_url() 改成 public.GetConfigValue('home')
+
+  class/jobs.py 文件 \#尝试升级到独立环境 下面的 public.get_url() 改成 public.GetConfigValue('home')
+
+  class/system.py 文件 RepPanel和UpdatePro方法内的 public.get_url() 改成 public.GetConfigValue('home')
+
+- 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
+
+  在 def get_improvement(): 这一行下面加上 return False
+
+  在free_login_area方法内get_free_ips_area替换成get_ips_area
+
+  在get_free_ip_info方法内，获取IP的部分改成res = get_ips_area([address])
+
+  在login_send_body方法内，free_login_area(login_ip=server_ip_area的server_ip_area改成login_ip
+
+- class/panelPlugin.py 文件，download_icon方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
+
+  删除public.total_keyword(get.query)这一行
+
+  __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')
+  ```
+
+- class/plugin_deployment.py 文件，SetupPackage方法内替换 public.GetConfigValue('home') => 'https://www.bt.cn'
+
+- install/install_soft.sh 在bash执行之前加入以下代码
+
+  ```shell
+  sed -i "s/http:\/\/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/" lib.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 文件  删除以下几行
+
+  "check_panel_msg": check_panel_msg,
+
+  PluginLoader.daemon_panel()
+
+- 去除WebRTC连接：BTPanel/static/js/public.js  删除stun.start();这一行
+
+- 去除首页广告：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();
+
+- 删除问卷调查：BTPanel/templates/default/layout.html 删除if(window.localStorage.getItem('panelNPS') == null)以及下面的行
+
+- [可选]去除各种计算题：复制bt.js到 BTPanel/static/ ，在 BTPanel/templates/default/layout.html 的\</body\>前面加入
+
+  ```javascript
+  <script src="/static/bt.js"></script>
+  ```
+
+- [可选]去除创建网站自动创建的垃圾文件：在class/panelSite.py，分别删除
+
+  htaccess = self.sitePath+'/.htaccess'
+
+  index = self.sitePath+'/index.html'
+
+  doc404 = self.sitePath+'/404.html'
+
+  这3行及分别接下来的4行代码
+
+- [可选]关闭未绑定域名提示页面：在class/panelSite.py，root /www/server/nginx/html改成return 400
+
+- [可选]关闭自动生成访问日志：在 BTPanel/\_\_init\_\_.py  删除public.write_request_log这一行
+
+- [可选]删除小图标广告：在BTPanel/static/js/site.js，删除“WAF防火墙”对应的span标签
+
+- [可选]上传文件默认选中覆盖，在BTPanel/static/js/upload-drog.js，id="all_operation"加checked属性
+
+
+解压安装包panel6.zip，将更新包改好的文件覆盖到里面，然后重新打包，即可更新安装包。（
+
+别忘了删除class文件夹里面所有的.so文件）
+