diff --git a/app/controller/Api.php b/app/controller/Api.php index 521a775..d964124 100644 --- a/app/controller/Api.php +++ b/app/controller/Api.php @@ -2,7 +2,6 @@ namespace app\controller; use think\facade\Db; -use think\facade\Cache; use app\BaseController; use app\lib\Plugins; @@ -467,40 +466,6 @@ class Api extends BaseController return json(['status'=>true, 'msg'=>'', 'data'=>$data]); } - //获取堡塔云WAF恶意IP库 - public function get_malicious_ip_list() - { - $cacheKey = 'malicious_ip_list'; - - // 尝试从缓存获取 - if (Cache::has($cacheKey)) { - return json(json_decode(Cache::get($cacheKey), true)); - } - $url = 'https://api.bt.cn/bt_waf/get_malicious_ip'; - $postData = json_encode([ - 'x_bt_token' => 'MzI3YjAzOGQ3Yjk3NjUxYjVlMDkyMGFm' - ]); - - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_HTTPHEADER, [ - 'Content-Type: application/json', - 'Content-Length: ' . strlen($postData) - ]); - - $response = curl_exec($ch); - if (curl_errno($ch)) { - return json(['status'=>true, 'msg'=>'', 'data'=>$data]); - } - curl_close($ch); - Cache::set($cacheKey, $response, 86400); //缓存一天 - - return json(json_decode($response, true)); - } - 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 87ce531..ae0764a 100644 --- a/app/script/convert.sh +++ b/app/script/convert.sh @@ -1,6 +1,6 @@ #!/bin/bash -Linux_Version="9.5.0" +Linux_Version="9.6.0" Windows_Version="8.2.2" Aapanel_Version="7.0.16" Btm_Version="2.3.0" diff --git a/public/install/src/panel6.zip b/public/install/src/panel6.zip index b756c22..d56ba44 100644 Binary files a/public/install/src/panel6.zip and b/public/install/src/panel6.zip differ diff --git a/public/install/update/LinuxPanel-9.5.0.pl b/public/install/update/LinuxPanel-9.5.0.pl new file mode 100644 index 0000000..81eeb7e --- /dev/null +++ b/public/install/update/LinuxPanel-9.5.0.pl @@ -0,0 +1 @@ +{"hash": "c097e387cb3f2baf34a222191de7130bd878215ffa4ba8cef2d337e3466e6963", "update_time": "1747723203"} \ No newline at end of file diff --git a/public/install/update/LinuxPanel-9.6.0.pl b/public/install/update/LinuxPanel-9.6.0.pl new file mode 100644 index 0000000..05d9e54 --- /dev/null +++ b/public/install/update/LinuxPanel-9.6.0.pl @@ -0,0 +1 @@ +{"hash": "d869ee4b8bdcfae324c4fdef9ec647db4a1529e7f6890b8cb4693f40b8a24626", "update_time": "1748242787"} \ No newline at end of file diff --git a/public/install/update/LinuxPanel-9.5.0.zip b/public/install/update/LinuxPanel-9.6.0.zip similarity index 84% rename from public/install/update/LinuxPanel-9.5.0.zip rename to public/install/update/LinuxPanel-9.6.0.zip index 60aeb6d..349b156 100644 Binary files a/public/install/update/LinuxPanel-9.5.0.zip and b/public/install/update/LinuxPanel-9.6.0.zip differ diff --git a/route/app.php b/route/app.php index baf383f..35b7c6f 100644 --- a/route/app.php +++ b/route/app.php @@ -18,7 +18,7 @@ Route::post('/Auth/GetBindCode', 'api/return_error'); Route::post('/auth/GetUserGiveAway', 'api/get_user_give_away'); Route::any('/bt_monitor/update_history', 'api/btm_update_history'); Route::any('/bt_monitor/latest_version', 'api/btm_latest_version'); -Route::any('/bt_waf/get_malicious_ip', 'api/get_malicious_ip_list'); +Route::any('/bt_waf/get_malicious_ip', 'api/get_ssl_list'); Route::any('/bt_waf/daily_count_v2', 'api/get_ssl_list'); Route::any('/bt_waf/latest_version', 'api/btwaf_latest_version');