|
@@ -44,7 +44,7 @@ class V4Controller extends Controller
|
|
|
$nodeOlin[$key]["online_user"] = $online_users;
|
|
|
}
|
|
|
|
|
|
- // var_dump($nodeOlin); die();
|
|
|
+ // var_dump($nodeOlin); die();
|
|
|
$logInfo = [];
|
|
|
foreach ($nodeOlin as $key => $vva) {
|
|
|
$input = [
|
|
@@ -82,7 +82,7 @@ class V4Controller extends Controller
|
|
|
$servers[] = $v->config($userinfo[0]);
|
|
|
}
|
|
|
return (new ClientController)->config("", $userinfo[0], $servers);
|
|
|
- //return response()->json(['ret' => 1, 'data' => $servers]);
|
|
|
+ //return response()->json(['ret' => 1, 'data' => $servers]);
|
|
|
//return response()->json(['ret' => 1, 'data' => ['userinfo'=>$userinfo,'servers'=>$servers],'']);
|
|
|
}
|
|
|
|
|
@@ -118,6 +118,7 @@ class V4Controller extends Controller
|
|
|
{
|
|
|
|
|
|
$isVless = $request->input("vless");
|
|
|
+ $debug = $request->input("isdebug");
|
|
|
$user = auth()->user();
|
|
|
$query = $user->nodes()->with(['labels', 'level_table','onlineLogs']);
|
|
|
if (empty($isVless)){
|
|
@@ -130,6 +131,43 @@ class V4Controller extends Controller
|
|
|
$nodeList = $query->where("vless",'=',0)->orderByDesc('sort')->orderBy('id')->get();
|
|
|
}
|
|
|
|
|
|
+ if(isset($debug))
|
|
|
+ {
|
|
|
+
|
|
|
+ foreach ($nodeList as $node) {
|
|
|
+
|
|
|
+ // 在线人数
|
|
|
+ $online_log = $node->onlineLogs()->where('log_time', '>=', strtotime('-5 minutes'))->latest('log_time')->first();
|
|
|
+
|
|
|
+ $node->leables = $node->labels;
|
|
|
+ $node->online_users = $online_log->online_user ?? 0;
|
|
|
+ $firstnode[] = $node;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ foreach ($firstnode as $key => $val){
|
|
|
+
|
|
|
+ $namesString = "";
|
|
|
+
|
|
|
+ foreach ($firstnode[$key]["leables"] as $label) {
|
|
|
+ $namesString .= $label["name"] . ", ";
|
|
|
+ }
|
|
|
+
|
|
|
+// 移除最后一个逗号和空格
|
|
|
+ $namesString = rtrim($namesString, ", ");
|
|
|
+ $servers[] = $val->config($user);
|
|
|
+ $servers[$key]["ip"] = $firstnode[$key]["ip"];
|
|
|
+ $servers[$key]["online_users"] = $firstnode[$key]["online_users"];
|
|
|
+ $servers[$key]["leables"] = $namesString;
|
|
|
+ $servers[$key]["leables_level"] = $firstnode[$key]["level_table"]["level"];
|
|
|
+ $servers[$key]["country_code"] = $firstnode[$key]["country_code"];
|
|
|
+ }
|
|
|
+ return response()->json($servers);
|
|
|
+ }
|
|
|
+
|
|
|
//var_dump($nodes); die();
|
|
|
if (isset($id)) {
|
|
|
$nodes = $user->nodes()->get();
|
|
@@ -149,16 +187,26 @@ class V4Controller extends Controller
|
|
|
|
|
|
// 在线人数
|
|
|
$online_log = $node->onlineLogs()->where('log_time', '>=', strtotime('-5 minutes'))->latest('log_time')->first();
|
|
|
+ $node->leables = $node->labels;
|
|
|
$node->online_users = $online_log->online_user ?? 0;
|
|
|
$firstnode[] = $node;
|
|
|
|
|
|
}
|
|
|
|
|
|
foreach ($firstnode as $key => $val){
|
|
|
+ $namesString = "";
|
|
|
+
|
|
|
+ foreach ($firstnode[$key]["leables"] as $label) {
|
|
|
+ $namesString .= $label["name"] . ", ";
|
|
|
+ }
|
|
|
+ $namesString = rtrim($namesString, ", ");
|
|
|
$servers[] = $val->config($user);
|
|
|
$servers[$key]["ip"] = $firstnode[$key]["ip"];
|
|
|
$servers[$key]["online_users"] = $firstnode[$key]["online_users"];
|
|
|
$servers[$key]["country_code"] = $firstnode[$key]["country_code"];
|
|
|
+ $servers[$key]["leables"] = $namesString;
|
|
|
+ $servers[$key]["leables_level"] = $firstnode[$key]["level_table"]["level"];
|
|
|
+ $servers[$key]["traffic_rate"] = $firstnode[$key]["traffic_rate"];
|
|
|
}
|
|
|
|
|
|
return response()->json(['ret' => 1, 'data' => $servers]);
|