Merge branch 'dev' of https://github.com/v2board/v2board into dev

2025-10-31 01:11:46 +08:00 · 2022-12-19 13:50:52 +08:00
parent c946a247ae 044e8f6c30
commit c8f3684312
25 changed files with 162 additions and 107 deletions
--- a/app/Console/Commands/V2boardUpdate.php
+++ b/app/Console/Commands/V2boardUpdate.php
@@ -57,6 +57,7 @@ class V2boardUpdate extends Command
            } catch (\Exception $e) {
            }
        }
-        $this->info('更新完毕，请重新启动队列服务。');
+        \Artisan::call('horizon:terminate');
+        $this->info('更新完毕，队列服务已重启，你无需进行任何操作。');
    }
 }
--- a/app/Http/Controllers/Admin/Server/RouteController.php
+++ b/app/Http/Controllers/Admin/Server/RouteController.php
@@ -15,6 +15,12 @@ class RouteController extends Controller
    public function fetch(Request $request)
    {
        $routes = ServerRoute::get();
+        // TODO: remove on 1.8.0
+        foreach ($routes as $k => $route) {
+            $array = json_decode($route->match, true);
+            if (is_array($array)) $routes[$k]['match'] = $array;
+        }
+        // TODO: remove on 1.8.0
        return [
            'data' => $routes
        ];
@@ -24,10 +30,19 @@ class RouteController extends Controller
    {
        $params = $request->validate([
            'remarks' => 'required',
-            'match' => 'required',
-            'action' => 'required',
+            'match' => 'required|array',
+            'action' => 'required|in:block,dns',
            'action_value' => 'nullable'
+        ], [
+            'remarks.required' => '备注不能为空',
+            'match.required' => '匹配值不能为空',
+            'action.required' => '动作类型不能为空',
+            'action.in' => '动作类型参数有误'
        ]);
+        $params['match'] = array_filter($params['match']);
+        // TODO: remove on 1.8.0
+        $params['match'] = json_encode($params['match']);
+        // TODO: remove on 1.8.0
        if ($request->input('id')) {
            try {
                $route = ServerRoute::find($request->input('id'));
--- a/app/Http/Controllers/Admin/ThemeController.php
+++ b/app/Http/Controllers/Admin/ThemeController.php
@@ -25,9 +25,9 @@ class ThemeController extends Controller
    {
        $themeConfigs = [];
        foreach ($this->themes as $theme) {
-            $themeConfigFile = $this->path . "{$theme}/config.php";
+            $themeConfigFile = $this->path . "{$theme}/config.json";
            if (!File::exists($themeConfigFile)) continue;
-            $themeConfig = include($themeConfigFile);
+            $themeConfig = json_decode(File::get($themeConfigFile), true);
            if (!isset($themeConfig['configs']) || !is_array($themeConfig)) continue;
            $themeConfigs[$theme] = $themeConfig;
            if (config("theme.{$theme}")) continue;
@@ -60,9 +60,10 @@ class ThemeController extends Controller
        ]);
        $payload['config'] = json_decode(base64_decode($payload['config']), true);
        if (!$payload['config'] || !is_array($payload['config'])) abort(500, '参数有误');
-        $themeConfigFile = public_path("theme/{$payload['name']}/config.php");
+        $themeConfigFile = public_path("theme/{$payload['name']}/config.json");
        if (!File::exists($themeConfigFile)) abort(500, '主题不存在');
-        $themeConfig = include($themeConfigFile);
+        $themeConfig = json_decode(File::get($themeConfigFile), true);
+        if (!isset($themeConfig['configs']) || !is_array($themeConfig)) abort(500, '主题配置文件有误');
        $validateFields = array_column($themeConfig['configs'], 'field_name');
        $config = [];
        foreach ($validateFields as $validateField) {
--- a/app/Http/Controllers/Client/Protocols/Surfboard.php
+++ b/app/Http/Controllers/Client/Protocols/Surfboard.php
@@ -71,6 +71,15 @@ class Surfboard
        $config = str_replace('$subs_domain', $subsDomain, $config);
        $config = str_replace('$proxies', $proxies, $config);
        $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
+
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $useTraffic = $upload + $download;
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+        $subscribeInfo = "title={$appName}订阅信息, content=上传流量：{$upload}GB\\n下载流量：{$download}GB\\n剩余流量：{$useTraffic}GB\\n套餐流量：{$totalTraffic}GB\\n到期时间：{$expireDate}";
+        $config = str_replace('$subscribe_info', $subscribeInfo, $config);
+
        return $config;
    }

--- a/app/Http/Controllers/Client/Protocols/Surge.php
+++ b/app/Http/Controllers/Client/Protocols/Surge.php
@@ -72,6 +72,15 @@ class Surge
        $config = str_replace('$subs_domain', $subsDomain, $config);
        $config = str_replace('$proxies', $proxies, $config);
        $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
+
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $useTraffic = $upload + $download;
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+        $subscribeInfo = "title={$appName}订阅信息, content=上传流量：{$upload}GB\\n下载流量：{$download}GB\\n剩余流量：{$useTraffic}GB\\n套餐流量：{$totalTraffic}GB\\n到期时间：{$expireDate}";
+        $config = str_replace('$subscribe_info', $subscribeInfo, $config);
+
        return $config;
    }

--- a/app/Http/Controllers/User/UserController.php
+++ b/app/Http/Controllers/User/UserController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
+use App\Services\AuthService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
@@ -18,6 +19,30 @@ use Illuminate\Support\Facades\Cache;

 class UserController extends Controller
 {
+    public function getActiveSession(Request $request)
+    {
+        $user = User::find($request->user['id']);
+        if (!$user) {
+            abort(500, __('The user does not exist'));
+        }
+        $authService = new AuthService($user);
+        return response([
+            'data' => $authService->getSessions()
+        ]);
+    }
+
+    public function removeActiveSession(Request $request)
+    {
+        $user = User::find($request->user['id']);
+        if (!$user) {
+            abort(500, __('The user does not exist'));
+        }
+        $authService = new AuthService($user);
+        return response([
+            'data' => $authService->delSession($request->input('session_id'))
+        ]);
+    }
+
    public function checkLogin(Request $request)
    {
        $data = [
--- a/app/Http/Routes/UserRoute.php
+++ b/app/Http/Routes/UserRoute.php
@@ -21,11 +21,12 @@ class UserRoute
            $router->get ('/checkLogin', 'User\\UserController@checkLogin');
            $router->post('/transfer', 'User\\UserController@transfer');
            $router->post('/getQuickLoginUrl', 'User\\UserController@getQuickLoginUrl');
+            $router->get ('/getActiveSession', 'User\\UserController@getActiveSession');
+            $router->post('/removeActiveSession', 'User\\UserController@removeActiveSession');
            // Order
            $router->post('/order/save', 'User\\OrderController@save');
            $router->post('/order/checkout', 'User\\OrderController@checkout');
            $router->get ('/order/check', 'User\\OrderController@check');
-            $router->get ('/order/details', 'User\\OrderController@detail');                                            // TODO: 1.7.0 remove
            $router->get ('/order/detail', 'User\\OrderController@detail');
            $router->get ('/order/fetch', 'User\\OrderController@fetch');
            $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
--- a/app/Services/AuthService.php
+++ b/app/Services/AuthService.php
@@ -14,7 +14,7 @@ class AuthService
 {
    private $user;

-    public function __construct($user)
+    public function __construct(User $user)
    {
        $this->user = $user;
    }
@@ -76,10 +76,23 @@ class AuthService
            $cacheKey,
            $sessions
        )) return false;
+        return true;
    }

    public function getSessions()
    {
        return (array)Cache::get(CacheKey::get("USER_SESSIONS", $this->user->id), []);
    }
+
+    public function delSession($sessionId)
+    {
+        $cacheKey = CacheKey::get("USER_SESSIONS", $this->user->id);
+        $sessions = (array)Cache::get($cacheKey, []);
+        unset($sessions[$sessionId]);
+        if (!Cache::put(
+            $cacheKey,
+            $sessions
+        )) return false;
+        return true;
+    }
 }
--- a/app/Services/ServerService.php
+++ b/app/Services/ServerService.php
@@ -221,7 +221,14 @@ class ServerService

    public function getRoutes(array $routeIds)
    {
-        return ServerRoute::select(['id', 'match', 'action', 'action_value'])->whereIn('id', $routeIds)->get();
+        $routes = ServerRoute::select(['id', 'match', 'action', 'action_value'])->whereIn('id', $routeIds)->get();
+        // TODO: remove on 1.8.0
+        foreach ($routes as $k => $route) {
+            $array = json_decode($route->match, true);
+            if (is_array($array)) $routes[$k]['match'] = $array;
+        }
+        // TODO: remove on 1.8.0
+        return $routes;
    }

    public function getServer($serverId, $serverType)
--- a/app/Services/ThemeService.php
+++ b/app/Services/ThemeService.php
@@ -18,9 +18,10 @@ class ThemeService

    public function init()
    {
-        $themeConfigFile = $this->path . "{$this->theme}/config.php";
-        if (!File::exists($themeConfigFile)) return;
-        $themeConfig = include($themeConfigFile);
+        $themeConfigFile = $this->path . "{$this->theme}/config.json";
+        if (!File::exists($themeConfigFile)) abort(500, "{$this->theme}主题不存在");
+        $themeConfig = json_decode(File::get($themeConfigFile), true);
+        if (!isset($themeConfig['configs']) || !is_array($themeConfig)) abort(500, "{$this->theme}主题配置文件有误");
        $configs = $themeConfig['configs'];
        $data = [];
        foreach ($configs as $config) {