diff --git a/app/Http/Controllers/Api/Client/V1Controller.php b/app/Http/Controllers/Api/Client/V1Controller.php index b4144438..b443a39e 100644 --- a/app/Http/Controllers/Api/Client/V1Controller.php +++ b/app/Http/Controllers/Api/Client/V1Controller.php @@ -24,7 +24,7 @@ class V1Controller extends Controller public function __construct() { - $this->middleware('auth:api', ['except' => ['login', 'register', 'shop', 'config', 'getConfig']]); + $this->middleware('auth:api')->except('login', 'register', 'shop', 'getConfig'); auth()->shouldUse('api'); } @@ -128,10 +128,7 @@ class V1Controller extends Controller public function nodeList(int $id = null) { - $user = auth()->user(); - $nodes = $user->nodes()->get(); - - return response()->json(['ret' => 1, 'data' => $nodes]); + return response()->json(['ret' => 1, 'data' => auth()->user()->nodes()->get()]); } public function shop() diff --git a/config/bobclient.php b/config/bobclient.php index 5667ba3f..68c0de8c 100644 --- a/config/bobclient.php +++ b/config/bobclient.php @@ -1,17 +1,18 @@ [ - 'telegram_url' => 'https://t.me/Bobs9', // 留空的话则不展示telegram群 - 'qq_url' => 'https://t.me/Bobs9', // 留空的话则不展示QQ群 - 'background_img' => 'https://shige.group/such/pic.php/forum/pic/item/00e93901213fb80e3d28759b21d12f2eb8389484/mlike.jpg', // 背景图片地址,图片宽高不超过 860px * 544px 就行 (留空为默认的背景图) + 'telegram_url' => '', // 留空的话则不展示telegram群 + 'qq_url' => '', // 留空的话则不展示QQ群 + 'background_img' => 'https://demo.proxypanel.ml/assets/images/logo64.png', // 背景图片地址,图片宽高不超过 860px * 544px 就行 (留空为默认的背景图) 'text' => '一键开启
极速上网体验', 'text_color' => 'rgba(255, 255, 255, 0.8);', // 文字和按钮颜色 默认颜色 rgba(255, 255, 255, 0.8); 'button_color' => '#8077f1', // 文字和按钮颜色 默认颜色:#8077f1(v2版本配置) @@ -25,7 +26,7 @@ return [ // Crisp在线客服 'crisp_enable' => false, // 是否开启 - 'crisp_id' => '2c3c28c2-9265-45ea-8e85-0xxxxx', // Crisp 的网站ID + 'crisp_id' => '', // Crisp 的网站ID // 弹窗公告 'notice' => [ @@ -49,5 +50,5 @@ return [ ], // 个人中心头像 - 'user_avatar' => 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=4109802972,297162689&fm=11&gp=0.jpg', + 'user_avatar' => 'https://demo.proxypanel.ml/assets/images/avatar.svg', ]; diff --git a/routes/api.php b/routes/api.php index a04d3911..6e77b87c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -13,7 +13,18 @@ Route::group(['namespace' => 'Api\WebApi', 'middleware' => 'webApi'], function ( Route::post('trigger/{node}', 'BaseController@addRuleLog'); // 上报用户触发的审计规则记录 }); - // VNet后端WEBAPI V1版 + // SSR后端WEBAPI V1版 + Route::group(['prefix' => 'ssr/v1'], function () { + Route::get('node/{node}', 'SSRController@getNodeInfo'); // 获取节点信息 + Route::post('nodeStatus/{node}', 'BaseController@setNodeStatus'); // 上报节点心跳信息 + Route::post('nodeOnline/{node}', 'BaseController@setNodeOnline'); // 上报节点在线人数 + Route::get('userList/{node}', 'SSRController@getUserList'); // 获取节点可用的用户列表 + Route::post('userTraffic/{node}', 'BaseController@setUserTraffic'); // 上报用户流量日志 + Route::get('nodeRule/{node}', 'BaseController@getNodeRule'); // 获取节点的审计规则 + Route::post('trigger/{node}', 'BaseController@addRuleLog'); // 上报用户触发的审计规则记录 + }); + + // VNet后端WEBAPI V1版 !!! 即将遗弃的api Route::group(['prefix' => 'web/v1'], function () { Route::get('node/{node}', 'SSRController@getNodeInfo'); // 获取节点信息 Route::post('nodeStatus/{node}', 'BaseController@setNodeStatus'); // 上报节点心跳信息 @@ -24,7 +35,7 @@ Route::group(['namespace' => 'Api\WebApi', 'middleware' => 'webApi'], function ( Route::post('trigger/{node}', 'BaseController@addRuleLog'); // 上报用户触发的审计规则记录 }); - // VNet后端WEBAPI V2版 + // VNet后端WEBAPI V2版 !!! 即将遗弃的api Route::group(['prefix' => 'vnet/v2'], function () { Route::get('node/{node}', 'SSRController@getNodeInfo'); // 获取节点信息 Route::post('nodeStatus/{node}', 'BaseController@setNodeStatus'); // 上报节点心跳信息