diff --git a/script/linedata/get_line_list.php b/script/linedata/get_line_list.php
index a6ece7b..dabb475 100755
--- a/script/linedata/get_line_list.php
+++ b/script/linedata/get_line_list.php
@@ -73,6 +73,46 @@ if ($mogu) {
     fclose($mogu_f);
 }
 
+
+//麒麟动态
+$dnx_has_exit = [];
+$qilin = new jinyou();
+
+$qilin_api_data = (array)((array)((array)($qilin::getDynamicLine()))['res'])['data'];
+
+if ($qilin_api_data) {
+    $qilin_data = get_product(__DIR__ . '/data/qilin.csv');
+    $qilin_f = fopen(__DIR__ . '/data/qilin.csv', 'w');
+    qilin_getList($qilin_api_data, $qilin_f, $all,$qilin_data);
+    fclose($qilin_f);
+}
+
+
+//猎豹
+$liebao = json_decode(file_get_contents("https://xmapi.xingmojs.com/ppp/v1/areas?apiid=130&sendtime=" . time() . "&sign=" . md5('apiid=130&sendtime=' . time() . '3AT7XCHjWG8sSMpRBjtAJ8JRkSAbhJit')), true)['data'];
+
+if($liebao){
+$liebao_data = get_product(__DIR__ . '/data/liebao.csv');
+$liebao_f = fopen(__DIR__ . '/data/liebao.csv', 'w');
+//写入天天文件
+liebao_getList($liebao, $liebao_f, $all, $liebao_data, '猎豹');
+fclose($liebao_f);
+}
+
+//先锋
+$xianfeng = json_decode(file_get_contents("http://service.shenlongip.com/api/server/getlist"), true)['P'];
+
+
+if($xianfeng){
+$xianfeng_data = get_product(__DIR__ . '/data/xianfeng.csv');
+$xianfeng_f = fopen(__DIR__ . '/data/xianfeng.csv', 'w');
+//写入先锋文件
+xianfeng_getList($xianfeng, $xianfeng_f, $all, $xianfeng_data);
+fclose($xianfeng_f);
+}
+
+
+
 $time =  time();
 $noce = md5(time());
 $apikey = 'a478ad5aa3079bbbef3cd45e2d55d61e';
@@ -87,24 +127,6 @@ $qiangzi_f = fopen(__DIR__ . '/data/qiangzi.csv', 'w');
 qiangzi_getList($qiangzi, $qiangzi_f, $all, $qiangzi_data);
 fclose($qiangzi_f);
 }
-// 静态
-$time =  time();
-$noce = md5(time());
-$apikey = 'a478ad5aa3079bbbef3cd45e2d55d61e';
-$sign = md5($time.$noce.$apikey);
-$url = "http://47.92.116.14:2222/api/getNodeList?agentid=admin1&ti=".$time."&nonce=".$noce."&sign=".$sign;
-$qiangzi = json_decode(file_get_contents($url), true)['data'];
-
-if(!empty($qiangzi)){
-    $qiangzi_data = get_product(__DIR__ . '/data/qiangzijt.csv');
-    $qiangzi_f = fopen(__DIR__ . '/data/qiangzijt.csv', 'w');
-    
-    //写入强子文件
-    qiangzijt_getList($qiangzi, $qiangzi_f, $all, $qiangzi_data);
-    fclose($qiangzi_f);
-}
-    
-
 
 
 $time =  time();
@@ -122,18 +144,6 @@ if ($xunlian){
     fclose($xunlian_f);
 }
 
-$url = 'http://int.linghangadmin.com:8000/sysadmin/useradmin/lineapi_admin1.php?secretId=108006113&secretKey=87085a351a64c116df09ebc07d5781sf';
-$huohu = json_decode(file_get_contents($url), true);
-
-
-if(!empty($huohu)){
-    $huohu_f = fopen(__DIR__ . '/data/huohu.csv', 'w');
-    //写入火狐文件
-    $huohu_data = get_product(__DIR__ . '/data/huohu.csv');
-    huohu_getList($huohu, $huohu_f, $all,$huohu_data);
-    fclose($huohu_f);
-}
-
 ///动态
 $url = 'http://int.linghangsoft.net:8000/sysadmin/useradmin/lineapi_admin1.php?secretId=108006113&secretKey=87085a351a64c116df09ebc07d5781sf';
 $yunniu = json_decode(file_get_contents($url), true);
@@ -147,66 +157,6 @@ if(!empty($yunniu)){
     fclose($yunniu_f);
 }
 
-//先锋
-$xianfeng = json_decode(file_get_contents("http://service.shenlongip.com/api/server/getlist"), true)['P'];
-
-
-if($xianfeng){
-$xianfeng_data = get_product(__DIR__ . '/data/xianfeng.csv');
-$xianfeng_f = fopen(__DIR__ . '/data/xianfeng.csv', 'w');
-//写入先锋文件
-xianfeng_getList($xianfeng, $xianfeng_f, $all, $xianfeng_data);
-fclose($xianfeng_f);
-}
-
-//麒麟动态
-$dnx_has_exit = [];
-$qilin = new jinyou();
-
-$qilin_api_data = (array)((array)((array)($qilin::getDynamicLine()))['res'])['data'];
-
-if ($qilin_api_data) {
-    $qilin_data = get_product(__DIR__ . '/data/qilin.csv');
-    $qilin_f = fopen(__DIR__ . '/data/qilin.csv', 'w');
-    qilin_getList($qilin_api_data, $qilin_f, $all,$qilin_data);
-    fclose($qilin_f);
-}
-
-$url = "https://www.jyip.net/static-list";
-$shuidi_api_data = json_decode(file_get_contents($url),true)['data'];
-
-if ($shuidi_api_data) {
-    $shuidi_data = get_product(__DIR__ . '/data/shuidi.csv');
-    $shuidi_f = fopen(__DIR__ . '/data/shuidi.csv', 'w');
-    shuidi_getList($shuidi_api_data, $shuidi_f, $all,$shuidi_data);
-    fclose($shuidi_f);
-}
-
-
-// $time =  time();
-// $noce = md5(time());
-// $apikey = 'd50f2b2ffd421efa67df8efb96d5ff6c';
-// $sign = md5($time.$noce.$apikey);
-// $url = "http://106.54.198.154/api/getNodeList?agentid=admin1&ti=".$time."&nonce=".$noce."&sign=".$sign;
-// $xingxing = json_decode(file_get_contents($url), true)['data'];
-// //写入星星文件
-// if($xingxing){
-// $xingxing_data = get_product(__DIR__ . '/data/xingxing.csv');
-// $xingxing_f = fopen(__DIR__ . '/data/xingxing.csv', 'w');
-// xingxing_getList($xingxing, $xingxing_f, $all, $xingxing_data);
-// fclose($xingxing_f);
-// }
-
-
-$jike = json_decode(file_get_contents("http://api.beikeip.com/beikeiplist/"), true)['data'];
-if($jike){
-$jike_data = get_product(__DIR__ . '/data/jike.csv');
-$jike_f = fopen(__DIR__ . '/data/jike.csv', 'w');
-//写入极客文件
-jike_getList($jike, $jike_f, $all, $jike_data);
-fclose($jike_f);
-}
-
 $xigua = json_decode(file_get_contents("http://api.beikeip.com/serverlistyzip/"), true)['data'];
 if($xigua){
 $xigua_data = get_product(__DIR__ . '/data/xigua.csv');
@@ -225,18 +175,76 @@ tiantian_getList($tiantian, $tiantian_f, $all, $tiantian_data, '天天');
 fclose($tiantian_f);
 }
 
-//猎豹
-$liebao = json_decode(file_get_contents("https://xmapi.xingmojs.com/ppp/v1/areas?apiid=130&sendtime=" . time() . "&sign=" . md5('apiid=130&sendtime=' . time() . '3AT7XCHjWG8sSMpRBjtAJ8JRkSAbhJit')), true)['data'];
-
-if($liebao){
-$liebao_data = get_product(__DIR__ . '/data/liebao.csv');
-$liebao_f = fopen(__DIR__ . '/data/liebao.csv', 'w');
-//写入天天文件
-liebao_getList($liebao, $liebao_f, $all, $liebao_data, '猎豹');
-fclose($liebao_f);
+$jike = json_decode(file_get_contents("http://api.beikeip.com/beikeiplist/"), true)['data'];
+if($jike){
+$jike_data = get_product(__DIR__ . '/data/jike.csv');
+$jike_f = fopen(__DIR__ . '/data/jike.csv', 'w');
+//写入极客文件
+jike_getList($jike, $jike_f, $all, $jike_data);
+fclose($jike_f);
 }
 
 
+//水滴
+$url = "https://www.jyip.net/static-list";
+$shuidi_api_data = json_decode(file_get_contents($url),true)['data'];
+
+if ($shuidi_api_data) {
+    $shuidi_data = get_product(__DIR__ . '/data/shuidi.csv');
+    $shuidi_f = fopen(__DIR__ . '/data/shuidi.csv', 'w');
+    shuidi_getList($shuidi_api_data, $shuidi_f, $all,$shuidi_data);
+    fclose($shuidi_f);
+}
+
+$url = 'http://int.linghangadmin.com:8000/sysadmin/useradmin/lineapi_admin1.php?secretId=108006113&secretKey=87085a351a64c116df09ebc07d5781sf';
+$huohu = json_decode(file_get_contents($url), true);
+
+
+if(!empty($huohu)){
+    $huohu_f = fopen(__DIR__ . '/data/huohu.csv', 'w');
+    //写入火狐文件
+    $huohu_data = get_product(__DIR__ . '/data/huohu.csv');
+    huohu_getList($huohu, $huohu_f, $all,$huohu_data);
+    fclose($huohu_f);
+}
+
+
+
+// 静态
+$time =  time();
+$noce = md5(time());
+$apikey = 'a478ad5aa3079bbbef3cd45e2d55d61e';
+$sign = md5($time.$noce.$apikey);
+$url = "http://47.92.116.14:2222/api/getNodeList?agentid=admin1&ti=".$time."&nonce=".$noce."&sign=".$sign;
+$qiangzi = json_decode(file_get_contents($url), true)['data'];
+
+if(!empty($qiangzi)){
+    $qiangzi_data = get_product(__DIR__ . '/data/qiangzijt.csv');
+    $qiangzi_f = fopen(__DIR__ . '/data/qiangzijt.csv', 'w');
+    
+    //写入强子文件
+    qiangzijt_getList($qiangzi, $qiangzi_f, $all, $qiangzi_data);
+    fclose($qiangzi_f);
+}
+    
+
+
+// $time =  time();
+// $noce = md5(time());
+// $apikey = 'd50f2b2ffd421efa67df8efb96d5ff6c';
+// $sign = md5($time.$noce.$apikey);
+// $url = "http://106.54.198.154/api/getNodeList?agentid=admin1&ti=".$time."&nonce=".$noce."&sign=".$sign;
+// $xingxing = json_decode(file_get_contents($url), true)['data'];
+// //写入星星文件
+// if($xingxing){
+// $xingxing_data = get_product(__DIR__ . '/data/xingxing.csv');
+// $xingxing_f = fopen(__DIR__ . '/data/xingxing.csv', 'w');
+// xingxing_getList($xingxing, $xingxing_f, $all, $xingxing_data);
+// fclose($xingxing_f);
+// }
+
+
+
 
 // $jinrui_data = get_product(__DIR__ . '/data/jinrui.csv');
 // $jinrui_f = fopen(__DIR__ . '/data/jinrui.csv', 'w');
@@ -245,14 +253,14 @@ fclose($liebao_f);
 // jinrui_getList($jinrui, $jinrui_f, $all, $jinrui_data);
 // fclose($jinrui_f);
 
-$laoying = json_decode(file_get_contents("http://diqu.pptp.pro:8070/sapi/getroslist"), true)['list'];
-if($laoying){
-$laoying_data = get_product(__DIR__ . '/data/laoying.csv');
-$laoying_f = fopen(__DIR__ . '/data/laoying.csv', 'w');
-//写入老鹰文件
-laoying_getList($laoying, $laoying_f, $all, $laoying_data);
-fclose($laoying_f);
-}
+// $laoying = json_decode(file_get_contents("http://diqu.pptp.pro:8070/sapi/getroslist"), true)['list'];
+// if($laoying){
+// $laoying_data = get_product(__DIR__ . '/data/laoying.csv');
+// $laoying_f = fopen(__DIR__ . '/data/laoying.csv', 'w');
+// //写入老鹰文件
+// laoying_getList($laoying, $laoying_f, $all, $laoying_data);
+// fclose($laoying_f);
+// }
 
 sleep(5);
 auto_format_list();