Skip to content

Commit 1ed4ac8

Browse files
author
flucout
committed
update
1 parent 3d5cb3c commit 1ed4ac8

File tree

11 files changed

+34
-9
lines changed

11 files changed

+34
-9
lines changed

app/command/CleanViteJs.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ private function handlefile($filepath){
166166
$file = preg_replace('!computed\(function\(\)\{return"input"===\w+\.\w+\.type\}\)!', '!1', $file);
167167
$code = $this->getExtendCode($file, '"自动部署"', 2);
168168
if($code){
169+
$file = str_replace($code.',', '', $file);
169170
$file = str_replace($code, '', $file);
170171
}
171172
$flag = true;
@@ -270,6 +271,10 @@ private function handlefile($filepath){
270271
if(strpos($file, '"打开插件文件目录"')!==false && strpos($file, '"(续费)"')!==false){ //soft.table
271272
$code = $this->getExtendFunction($file, '"(续费)"');
272273
$file = str_replace($code, '""', $file);
274+
$code = $this->getExtendCode($file, 'activity_id:47', 2);
275+
if($code){
276+
$file = str_replace($code, '{}', $file);
277+
}
273278
$flag = true;
274279
}
275280

app/command/UpdateAll.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ private function process_plugins(Input $input, Output $output, $os){
5757
$json_arr = Plugins::get_plugin_list($os);
5858
//循环下载缺少的插件
5959
foreach($json_arr['list'] as $plugin){
60-
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;
60+
if($type == 0 && ($plugin['type']==8 || $plugin['type']==12) || $type == 1 && $plugin['type']==12 || $plugin['type']==10 || $plugin['type']==5) continue;
61+
if(in_array($plugin['name'], \app\lib\BtPlugins::$skip_plugins)) continue;
6162

6263
foreach($plugin['versions'] as $version){
6364
$ver = $version['m_version'].'.'.$version['version'];

app/controller/Api.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,17 @@ public function get_malicious_ip_list()
580580
return json(json_decode($response, true));
581581
}
582582

583+
public function get_ip_info(){
584+
$ip = input('post.ip');
585+
$data = [];
586+
$url = 'https://www.bt.cn/api/ip/info_json';
587+
$post = http_build_query(['ip'=>$ip]);
588+
$response = get_curl($url, $post);
589+
$arr = json_decode($response, true);
590+
if($arr) $data = $arr;
591+
return json($data);
592+
}
593+
583594
public function return_success(){
584595
return json(['status'=>true, 'msg'=>1, 'data'=>(object)[]]);
585596
}

app/script/convert.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
Linux_Version="11.3.0"
3+
Linux_Version="11.4.0"
44
Windows_Version="8.2.2"
55
Aapanel_Version="7.0.25"
66
Btm_Version="2.3.3"

install.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ INSERT INTO `cloud_config` (`key`, `value`) VALUES
1212
('bt_key', ''),
1313
('whitelist', '0'),
1414
('download_page', '1'),
15-
('new_version', '11.3.0'),
15+
('new_version', '11.4.0'),
1616
('update_msg', '暂无更新日志'),
17-
('update_date', '2025-11-25'),
18-
('new_version_win', '8.4.6'),
17+
('update_date', '2025-12-16'),
18+
('new_version_win', '8.5.0'),
1919
('update_msg_win', '暂无更新日志'),
20-
('update_date_win', '2025-11-25'),
20+
('update_date_win', '2025-12-16'),
2121
('new_version_en', '7.0.25'),
2222
('update_msg_en', '暂无更新日志'),
2323
('update_date_en', '2025-09-10'),

public/install/src/panel6.zip

338 KB
Binary file not shown.
30.5 MB
Binary file not shown.

route/app.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@
106106
Route::get('/panel/notpro', 'api/return_empty');
107107
Route::post('/Btdeployment/get_deplist', 'api/get_deplist');
108108
Route::post('/panel/get_deplist', 'api/get_deplist');
109-
Route::get('/ip/info_json', 'api/return_empty_array');
109+
Route::post('/ip/info', 'api/get_ip_info');
110+
Route::post('/ip/info_json', 'api/get_ip_info');
111+
Route::post('/panel/get_ip_info', 'api/get_ip_info');
110112

111113
Route::post('/LinuxBeta', 'api/return_error');
112114
Route::post('/panel/apple_beta', 'api/return_error');
@@ -155,6 +157,7 @@
155157
Route::post('/panel/submit_expand_pack_used', 'api/return_success');
156158
Route::get('/panel/getLatestOfficialVersion', 'api/get_version_en');
157159
Route::post('/cert/user/list', 'api/nps_questions');
160+
Route::post('/v2/user/wx_web/bound_wx_accounts', 'api/nps_questions');
158161

159162
Route::post('/Auth/GetCloudToken', 'api/get_auth_token');
160163
Route::post('/cloudtro/version_info', 'api/cloudc_version_info');
@@ -164,6 +167,10 @@
164167
Route::miss('api/return_error');
165168
});
166169

170+
Route::group('newapi', function () {
171+
Route::miss('api/return_error');
172+
});
173+
167174
Route::get('/admin/verifycode', 'admin/verifycode')->middleware(\think\middleware\SessionInit::class);
168175
Route::any('/admin/login', 'admin/login')->middleware(\think\middleware\SessionInit::class);
169176
Route::get('/admin/logout', 'admin/logout');

wiki/update.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
- 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/(需排除js文件)
2020

21+
- 全局搜索替换 https://www.bt.cn/newapi/ => http://www.example.com/newapi/
22+
2123
- 全局搜索替换 https://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
2224

2325
http://download.bt.cn/install/update6.sh => http://www.example.com/install/update6.sh
@@ -98,8 +100,6 @@
98100

99101
- script/upgrade_panel_optimized.py 文件,def get_home_node(url): 下面加上return url
100102

101-
- tools.py 文件,u_input == 16下面的public.get_url()替换成public.GetConfigValue('home')
102-
103103
- install/install_soft.sh 在. 执行之前加入以下代码
104104

105105
```shell

0 commit comments

Comments
 (0)