bao/portal-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Enhance service management and transaction handling

Browse Source 
- Implemented client access token verification middleware to secure API endpoints.
- Updated ServiceController to fetch active hosting services for authenticated users.
- Refactored OrderController to ensure order retrieval is customer-specific.
- Improved error logging in VmController for unexpected vCenter responses.
- Disabled VNPay auto-deposit in TransactionController, switching to manual deposit flow.
- Enhanced ServiceClientDetailResource to include Plesk credentials for hosting accounts.
- Adjusted VpsServiceResource to dynamically set page type based on product type.
- Added logging for PowerShellService to capture errors in RDP port changes.
- Provisioning job now resolves service plans and logs relevant information for hosting accounts.
- Updated database migrations to add necessary fields for service plans and DNS servers.
- Refactored Service and ServicePlan models to establish relationships with hosting accounts and DNS servers.
This commit is contained in:
baodev0
2026-08-17 11:55:48 +07:00
parent b03ee9fc2d
commit 2deb4ad74e
28 changed files with 489 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Admin/DnsManager/ServerController.php
+13
View File
@@ -22,6 +22,7 @@ class ServerController extends Controller
$perPage = min((int) $request->get('per_page', 15), 500);
$filter = $request->get('filter');
$status = $request->get('status');
$type = $request->get('type');
$query = $this->serverRepository->model->newQuery();
@@ -37,6 +38,14 @@ class ServerController extends Controller
$query->where('status', $status);
}
if ($type === 'hosting') {
$query->whereIn('type', ['hosting', 'both']);
} elseif ($type === 'domain') {
$query->whereIn('type', ['domain', 'both']);
} elseif ($type !== null && $type !== '') {
$query->where('type', $type);
}
$paginator = $query->orderByDesc('id')->paginate($perPage);
return response()->json([
@@ -70,6 +79,7 @@ class ServerController extends Controller
$validated = $request->validate([
'name' => 'required|string|max:255',
'ip_address' => 'required|string|max:255',
'panel_port' => 'nullable|integer|min:1|max:65535',
'username' => 'required|string|max:255',
'password' => 'required|string|max:255',
'api_key' => 'nullable|string',
@@ -83,6 +93,7 @@ class ServerController extends Controller
$server = $this->serverRepository->create([
'name' => $validated['name'],
'ip_address' => $validated['ip_address'],
'panel_port' => $validated['panel_port'] ?? 8880,
'username' => $validated['username'],
'password' => Crypt::encryptString($validated['password']),
'api_key' => $validated['api_key'] ?? null,
@@ -114,6 +125,7 @@ class ServerController extends Controller
$validated = $request->validate([
'name' => 'sometimes|required|string|max:255',
'ip_address' => 'sometimes|required|string|max:255',
'panel_port' => 'nullable|integer|min:1|max:65535',
'username' => 'sometimes|required|string|max:255',
'password' => 'nullable|string|max:255',
'api_key' => 'nullable|string',
@@ -182,6 +194,7 @@ class ServerController extends Controller
'id' => $server->id,
'name' => $server->name,
'ip_address' => $server->ip_address,
'panel_port' => $server->panel_port,
'username' => $server->username,
'api_key' => $server->api_key,
'status' => $server->status,
app/Http/Controllers/Api/Admin/Hosting/ServicePlanController.php
+32 -28
View File
@@ -11,14 +11,14 @@ class ServicePlanController extends Controller
{
public function index(): JsonResponse
{
$plans = ServicePlan::with('plesk')->orderBy('title')->get();
$plans = ServicePlan::with('plesk', 'dnsServer')->orderBy('title')->get();
return response()->json(['error' => false, 'data' => $plans]);
}
public function show(int $id): JsonResponse
{
$plan = ServicePlan::with('plesk')->find($id);
$plan = ServicePlan::with('plesk', 'dnsServer')->find($id);
if (!$plan) {
return response()->json(['error' => true, 'message' => 'Không tìm thấy gói hosting.'], 404);
@@ -30,21 +30,23 @@ class ServicePlanController extends Controller
public function store(Request $request): JsonResponse
{
$validated = $request->validate([
'title' => 'required|string|max:255',
'vcpu' => 'required|integer|min:0',
'ram' => 'required|integer|min:0',
'disk' => 'required|integer|min:0',
'domain' => 'required|integer|min:0',
'plesk_plan_name' => 'nullable|string|max:255',
'note' => 'nullable|string',
'title' => 'required|string|max:255',
'vcpu' => 'required|integer|min:0',
'ram' => 'required|integer|min:0',
'disk' => 'required|integer|min:0',
'domain' => 'required|integer|min:0',
'dns_manager_server_id' => 'nullable|integer|exists:dns_manager_servers,id',
'plesk_plan_name' => 'nullable|string|max:255',
'note' => 'nullable|string',
]);
$plan = ServicePlan::create([
'title' => $validated['title'],
'vcpu' => $validated['vcpu'],
'ram' => $validated['ram'],
'disk' => $validated['disk'],
'domain' => $validated['domain'],
'title' => $validated['title'],
'vcpu' => $validated['vcpu'],
'ram' => $validated['ram'],
'disk' => $validated['disk'],
'domain' => $validated['domain'],
'dns_manager_server_id' => $validated['dns_manager_server_id'] ?? null,
]);
$this->savePlesk($plan, $validated);
@@ -52,7 +54,7 @@ class ServicePlanController extends Controller
return response()->json([
'error' => false,
'message' => 'Tạo gói hosting thành công.',
'data' => $plan->load('plesk'),
'data' => $plan->load('plesk', 'dnsServer'),
], 201);
}
@@ -65,21 +67,23 @@ class ServicePlanController extends Controller
}
$validated = $request->validate([
'title' => 'required|string|max:255',
'vcpu' => 'required|integer|min:0',
'ram' => 'required|integer|min:0',
'disk' => 'required|integer|min:0',
'domain' => 'required|integer|min:0',
'plesk_plan_name' => 'nullable|string|max:255',
'note' => 'nullable|string',
'title' => 'required|string|max:255',
'vcpu' => 'required|integer|min:0',
'ram' => 'required|integer|min:0',
'disk' => 'required|integer|min:0',
'domain' => 'required|integer|min:0',
'dns_manager_server_id' => 'nullable|integer|exists:dns_manager_servers,id',
'plesk_plan_name' => 'nullable|string|max:255',
'note' => 'nullable|string',
]);
$plan->update([
'title' => $validated['title'],
'vcpu' => $validated['vcpu'],
'ram' => $validated['ram'],
'disk' => $validated['disk'],
'domain' => $validated['domain'],
'title' => $validated['title'],
'vcpu' => $validated['vcpu'],
'ram' => $validated['ram'],
'disk' => $validated['disk'],
'domain' => $validated['domain'],
'dns_manager_server_id' => $validated['dns_manager_server_id'] ?? null,
]);
$this->savePlesk($plan, $validated);
@@ -87,7 +91,7 @@ class ServicePlanController extends Controller
return response()->json([
'error' => false,
'message' => 'Cập nhật gói hosting thành công.',
'data' => $plan->fresh('plesk'),
'data' => $plan->fresh(['plesk', 'dnsServer']),
]);
}