tokumeikoi 2 роки тому
батько
коміт
4d8bb0d8e9

+ 2 - 2
app/Http/Controllers/Admin/ConfigController.php

@@ -107,7 +107,8 @@ class ConfigController extends Controller
                 'currency_symbol' => config('v2board.currency_symbol', '¥'),
                 'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
                 'register_limit_count' => config('v2board.register_limit_count', 3),
-                'register_limit_expire' => config('v2board.register_limit_expire', 60)
+                'register_limit_expire' => config('v2board.register_limit_expire', 60),
+                'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', 'admin'))
             ],
             'subscribe' => [
                 'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
@@ -124,7 +125,6 @@ class ConfigController extends Controller
                 'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
                 'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
                 'frontend_background_url' => config('v2board.frontend_background_url'),
-                'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin')
             ],
             'server' => [
                 'server_token' => config('v2board.server_token'),

+ 1 - 1
app/Http/Requests/Admin/ConfigSave.php

@@ -46,6 +46,7 @@ class ConfigSave extends FormRequest
         'register_limit_by_ip_enable' => 'in:0,1',
         'register_limit_count' => 'integer',
         'register_limit_expire' => 'integer',
+        'secure_path' => '',
         // subscribe
         'plan_change_enable' => 'in:0,1',
         'reset_traffic_method' => 'in:0,1,2,3,4',
@@ -64,7 +65,6 @@ class ConfigSave extends FormRequest
         'frontend_theme_header' => 'in:dark,light',
         'frontend_theme_color' => 'in:default,darkblue,black,green',
         'frontend_background_url' => 'nullable|url',
-        'frontend_admin_path' => '',
         // email
         'email_template' => '',
         'email_host' => '',

+ 1 - 1
app/Http/Routes/AdminRoute.php

@@ -8,7 +8,7 @@ class AdminRoute
     public function map(Registrar $router)
     {
         $router->group([
-            'prefix' => 'admin',
+            'prefix' => config('v2board.secure_path', config('v2board.frontend_admin_path', 'admin')),
             'middleware' => 'admin'
         ], function ($router) {
             // Config

+ 3 - 1
public/assets/admin/env.example.js

@@ -11,5 +11,7 @@ window.settings = {
   },
   // 背景
   background_url: '',
-  logo: ''
+  logo: '',
+  // 需与V2Board设置中的后台路径一致
+  secure_path: 'admin'
 }

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
public/assets/admin/umi.js


+ 2 - 1
resources/views/admin.blade.php

@@ -20,7 +20,8 @@
             },
             version: '{{$version}}',
             background_url: '{{$background_url}}',
-            logo: '{{$logo}}'
+            logo: '{{$logo}}',
+            secure_path: '{{$secure_path}}'
         }
     </script>
 </head>

+ 4 - 2
routes/web.php

@@ -38,7 +38,8 @@ Route::get('/', function (Request $request) {
     return view('theme::' . config('v2board.frontend_theme', 'v2board') . '.dashboard', $renderParams);
 });
 
-Route::get('/' . config('v2board.frontend_admin_path', 'admin'), function () {
+//TODO:: 兼容
+Route::get('/' . config('v2board.secure_path', config('v2board.frontend_admin_path', 'admin')), function () {
     return view('admin', [
         'title' => config('v2board.app_name', 'V2Board'),
         'theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
@@ -46,6 +47,7 @@ Route::get('/' . config('v2board.frontend_admin_path', 'admin'), function () {
         'theme_color' => config('v2board.frontend_theme_color', 'default'),
         'background_url' => config('v2board.frontend_background_url'),
         'version' => config('app.version'),
-        'logo' => config('v2board.logo')
+        'logo' => config('v2board.logo'),
+        'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', 'admin'))
     ]);
 });

Деякі файли не було показано, через те що забагато файлів було змінено