yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-01-10 16:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: more secure path

Browse Source
This commit is contained in:
tokumeikoi 2022-12-15 00:59:32 +08:00
parent a77523c3b5
commit 4d8bb0d8e9
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/ConfigController.php
View File

@ -107,7 +107,8 @@ class ConfigController extends Controller
'currency_symbol' => config('v2board.currency_symbol', '¥'), 'currency_symbol' => config('v2board.currency_symbol', '¥'),
'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0), '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_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' => [ 'subscribe' => [
'plan_change_enable' => (int)config('v2board.plan_change_enable', 1), '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_header' => config('v2board.frontend_theme_header', 'dark'),
'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'), 'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
'frontend_background_url' => config('v2board.frontend_background_url'), 'frontend_background_url' => config('v2board.frontend_background_url'),
'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin')
], ],
'server' => [ 'server' => [
'server_token' => config('v2board.server_token'), 'server_token' => config('v2board.server_token'),

2
app/Http/Requests/Admin/ConfigSave.php
View File

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

2
app/Http/Routes/AdminRoute.php
View File

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

4
public/assets/admin/env.example.js vendored
View File

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

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long

3
resources/views/admin.blade.php
View File

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

6
routes/web.php
View File

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