diff --git a/app/command/CleanViteJs.php b/app/command/CleanViteJs.php index 9f5c43a..b545aed 100644 --- a/app/command/CleanViteJs.php +++ b/app/command/CleanViteJs.php @@ -166,6 +166,7 @@ class CleanViteJs extends Command $file = preg_replace('!computed\(function\(\)\{return"input"===\w+\.\w+\.type\}\)!', '!1', $file); $code = $this->getExtendCode($file, '"自动部署"', 2); if($code){ + $file = str_replace($code.',', '', $file); $file = str_replace($code, '', $file); } $flag = true; @@ -270,6 +271,10 @@ class CleanViteJs extends Command if(strpos($file, '"打开插件文件目录"')!==false && strpos($file, '"(续费)"')!==false){ //soft.table $code = $this->getExtendFunction($file, '"(续费)"'); $file = str_replace($code, '""', $file); + $code = $this->getExtendCode($file, 'activity_id:47', 2); + if($code){ + $file = str_replace($code, '{}', $file); + } $flag = true; } diff --git a/app/command/UpdateAll.php b/app/command/UpdateAll.php index 3fd6336..46e8a03 100644 --- a/app/command/UpdateAll.php +++ b/app/command/UpdateAll.php @@ -57,7 +57,8 @@ class UpdateAll extends Command $json_arr = Plugins::get_plugin_list($os); //循环下载缺少的插件 foreach($json_arr['list'] as $plugin){ - if($type == 0 && ($plugin['type']==8 || $plugin['type']==12 || in_array($plugin['name'], \app\lib\BtPlugins::$skip_plugins)) || $type == 1 && $plugin['type']==12 || $plugin['type']==10 || $plugin['type']==5) continue; + if($type == 0 && ($plugin['type']==8 || $plugin['type']==12) || $type == 1 && $plugin['type']==12 || $plugin['type']==10 || $plugin['type']==5) continue; + if(in_array($plugin['name'], \app\lib\BtPlugins::$skip_plugins)) continue; foreach($plugin['versions'] as $version){ $ver = $version['m_version'].'.'.$version['version']; diff --git a/app/controller/Api.php b/app/controller/Api.php index 877da87..19b17c0 100644 --- a/app/controller/Api.php +++ b/app/controller/Api.php @@ -580,6 +580,17 @@ class Api extends BaseController return json(json_decode($response, true)); } + public function get_ip_info(){ + $ip = input('post.ip'); + $data = []; + $url = 'https://www.bt.cn/api/ip/info_json'; + $post = http_build_query(['ip'=>$ip]); + $response = get_curl($url, $post); + $arr = json_decode($response, true); + if($arr) $data = $arr; + return json($data); + } + public function return_success(){ return json(['status'=>true, 'msg'=>1, 'data'=>(object)[]]); } diff --git a/app/script/convert.sh b/app/script/convert.sh index 8fcaec2..dc2421f 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="11.3.0" +Linux_Version="11.4.0" Windows_Version="8.2.2" Aapanel_Version="7.0.25" Btm_Version="2.3.3" diff --git a/install.sql b/install.sql index 660e469..5904796 100644 --- a/install.sql +++ b/install.sql @@ -12,12 +12,12 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES ('bt_key', ''), ('whitelist', '0'), ('download_page', '1'), -('new_version', '11.3.0'), +('new_version', '11.4.0'), ('update_msg', '暂无更新日志'), -('update_date', '2025-11-25'), -('new_version_win', '8.4.6'), +('update_date', '2025-12-16'), +('new_version_win', '8.5.0'), ('update_msg_win', '暂无更新日志'), -('update_date_win', '2025-11-25'), +('update_date_win', '2025-12-16'), ('new_version_en', '7.0.25'), ('update_msg_en', '暂无更新日志'), ('update_date_en', '2025-09-10'), diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index 5e81c45..8596f6b 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-11.3.0.zip b/public/install/update/LinuxPanel-11.4.0.zip similarity index 85% rename from public/install/update/LinuxPanel-11.3.0.zip rename to public/install/update/LinuxPanel-11.4.0.zip index 9e65158..cfef1ac 100644 Binary files a/public/install/update/LinuxPanel-11.3.0.zip and b/public/install/update/LinuxPanel-11.4.0.zip differ diff --git a/public/win/panel/panel_8.4.6.zip b/public/win/panel/panel_8.5.0.zip similarity index 81% rename from public/win/panel/panel_8.4.6.zip rename to public/win/panel/panel_8.5.0.zip index ed05049..575965b 100644 Binary files a/public/win/panel/panel_8.4.6.zip and b/public/win/panel/panel_8.5.0.zip differ diff --git a/route/app.php b/route/app.php index 198e5fa..3be2a7c 100644 --- a/route/app.php +++ b/route/app.php @@ -106,7 +106,9 @@ Route::group('api', function () { Route::get('/panel/notpro', 'api/return_empty'); Route::post('/Btdeployment/get_deplist', 'api/get_deplist'); Route::post('/panel/get_deplist', 'api/get_deplist'); - Route::get('/ip/info_json', 'api/return_empty_array'); + Route::post('/ip/info', 'api/get_ip_info'); + Route::post('/ip/info_json', 'api/get_ip_info'); + Route::post('/panel/get_ip_info', 'api/get_ip_info'); Route::post('/LinuxBeta', 'api/return_error'); Route::post('/panel/apple_beta', 'api/return_error'); @@ -155,6 +157,7 @@ Route::group('api', function () { Route::post('/panel/submit_expand_pack_used', 'api/return_success'); Route::get('/panel/getLatestOfficialVersion', 'api/get_version_en'); Route::post('/cert/user/list', 'api/nps_questions'); + Route::post('/v2/user/wx_web/bound_wx_accounts', 'api/nps_questions'); Route::post('/Auth/GetCloudToken', 'api/get_auth_token'); Route::post('/cloudtro/version_info', 'api/cloudc_version_info'); @@ -164,6 +167,10 @@ Route::group('api', function () { Route::miss('api/return_error'); }); +Route::group('newapi', function () { + Route::miss('api/return_error'); +}); + Route::get('/admin/verifycode', 'admin/verifycode')->middleware(\think\middleware\SessionInit::class); Route::any('/admin/login', 'admin/login')->middleware(\think\middleware\SessionInit::class); Route::get('/admin/logout', 'admin/logout'); diff --git a/wiki/update.md b/wiki/update.md index 3779d0c..d887f03 100644 --- a/wiki/update.md +++ b/wiki/update.md @@ -18,6 +18,8 @@ - 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/(需排除js文件) +- 全局搜索替换 https://www.bt.cn/newapi/ => http://www.example.com/newapi/ + - 全局搜索替换 https://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh http://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh @@ -98,8 +100,6 @@ - script/upgrade_panel_optimized.py 文件,def get_home_node(url): 下面加上return url -- tools.py 文件,u_input == 16下面的public.get_url()替换成public.GetConfigValue('home') - - install/install_soft.sh 在. 执行之前加入以下代码 ```shell diff --git a/wiki/updatewin.md b/wiki/updatewin.md index 09f86a1..98ec58d 100644 --- a/wiki/updatewin.md +++ b/wiki/updatewin.md @@ -5,5 +5,6 @@ 官方更新包下载链接:http://download.bt.cn/win/panel/panel_版本号.zip - 使用16进制编辑器打开btPanel.exe,将 https://api.bt.cn 替换成 http://api.bt.cn/ ,将 https://www.bt.cn 替换成 http://www.bt.cn/ ,然后将api.bt.cn替换成任意其他域名,将第二个www.bt.cn替换成任意其他域名。 +- 批量解密模块文件:执行 php think decrypt classdir <面板class文件夹路径> - 新版vite页面去除需求反馈、各种广告、计算题等,执行 php think cleanvitejs <面板assets/static/js路径>