mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use DEMO_TENANT_PORT env var for demo logic isolation
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Successful in 55s
Details
Koori-ERP-Deploy-System / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
sky121113
2026-01-16 09:28:29 +08:00
parent 231d1ad029
commit 32f993a6e1
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Auth/LoginController.php
View File

@@ -17,8 +17,9 @@ class LoginController extends Controller
{ {
$centralDomains = config('tenancy.central_domains', []); $centralDomains = config('tenancy.central_domains', []);
// [Hack] Demo 環境特殊規則：Port 8081 強制視為租戶 // [Hack] Demo 環境特殊規則
if (request()->getPort() != 8081 && in_array(request()->getHost(), $centralDomains)) { $demoPort = config('tenancy.demo_tenant_port');
if ((!$demoPort || request()->getPort() != $demoPort) && in_array(request()->getHost(), $centralDomains)) {
return Inertia::render('Landlord/Auth/Login'); return Inertia::render('Landlord/Auth/Login');
} }
@@ -45,8 +46,9 @@ class LoginController extends Controller
$centralDomains = config('tenancy.central_domains', []); $centralDomains = config('tenancy.central_domains', []);
$centralDomains = config('tenancy.central_domains', []); $centralDomains = config('tenancy.central_domains', []);
// [Hack] Demo 環境特殊規則：Port 8081 強制視為租戶 // [Hack] Demo 環境特殊規則
if ($request->getPort() != 8081 && in_array($request->getHost(), $centralDomains)) { $demoPort = config('tenancy.demo_tenant_port');
if ((!$demoPort || $request->getPort() != $demoPort) && in_array($request->getHost(), $centralDomains)) {
return redirect()->intended(route('landlord.dashboard')); return redirect()->intended(route('landlord.dashboard'));
} }

3
app/Http/Controllers/DashboardController.php
View File

@@ -16,7 +16,8 @@ class DashboardController extends Controller
{ {
$centralDomains = config('tenancy.central_domains', []); $centralDomains = config('tenancy.central_domains', []);
if (request()->getPort() != 8081 && in_array(request()->getHost(), $centralDomains)) { $demoPort = config('tenancy.demo_tenant_port');
if ((!$demoPort || request()->getPort() != $demoPort) && in_array(request()->getHost(), $centralDomains)) {
return redirect()->route('landlord.dashboard'); return redirect()->route('landlord.dashboard');
} }

6
app/Http/Middleware/UniversalTenancy.php
View File

@@ -20,9 +20,9 @@ class UniversalTenancy
$centralDomains = config('tenancy.central_domains', []); $centralDomains = config('tenancy.central_domains', []);
// [Hack] Demo 環境特殊規則： // [Hack] Demo 環境特殊規則：
// 如果是 8081 端口，強制視為租戶請求 (忽略中央域名檢查) // 如果設定了 demo_tenant_port (e.g. 8081)，且請求端口相符，強制視為租戶請求
// 這樣可以讓 192.168.0.103:8081 直接訪問租戶，無需設定 hosts $demoPort = config('tenancy.demo_tenant_port');
if ($request->getPort() == 8081) { if ($demoPort && $request->getPort() == $demoPort) {
return app(InitializeTenancyByDomain::class)->handle($request, $next); return app(InitializeTenancyByDomain::class)->handle($request, $next);
} }

11
config/tenancy.php
View File

@@ -20,6 +20,17 @@ return [
array_map('trim', explode(',', env('CENTRAL_DOMAINS', '127.0.0.1,localhost'))) array_map('trim', explode(',', env('CENTRAL_DOMAINS', '127.0.0.1,localhost')))
), ),
/*
|--------------------------------------------------------------------------
| Demo Mode Tenant Port
|--------------------------------------------------------------------------
|
| If set, requests on this port will be treated as tenant requests
| regardless of the host domain. Useful for IP-based demo access.
|
*/
'demo_tenant_port' => env('DEMO_TENANT_PORT'),
/** /**
* Tenancy bootstrappers are executed when tenancy is initialized. * Tenancy bootstrappers are executed when tenancy is initialized.
* Their responsibility is making Laravel features tenant-aware. * Their responsibility is making Laravel features tenant-aware.