lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-24 12:07:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 重构规范部分代码、邮件队列增加失败重试、去除多个支付方式、更新依赖

Browse Source
This commit is contained in:
xboard
2024-04-10 00:51:03 +08:00
parent ec63e05575
commit 4c6c7182e2
50 changed files with 421 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/V1/Admin/ConfigController.php
+3 -3
View File
@@ -4,8 +4,8 @@ namespace App\Http\Controllers\V1\Admin;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ConfigSave;
use App\Jobs\SendEmailJob;
use App\Models\Setting;
use App\Services\MailService;
use App\Services\TelegramService;
use App\Utils\Dict;
use Illuminate\Http\Request;
@@ -33,7 +33,7 @@ class ConfigController extends Controller
public function testSendMail(Request $request)
{
$obj = new SendEmailJob([
$mailLog = MailService::sendEmail([
'email' => $request->user['email'],
'subject' => 'This is xboard test email',
'template_name' => 'notify',
@@ -45,7 +45,7 @@ class ConfigController extends Controller
]);
return response([
'data' => true,
'log' => $obj->handle()
'log' => $mailLog
]);
}
app/Http/Controllers/V1/Admin/OrderController.php
+4 -4
View File
@@ -160,13 +160,13 @@ class OrderController extends Controller
$order->total_amount = $request->input('total_amount');
if ($order->period === 'reset_price') {
$order->type = 4;
$order->type = Order::TYPE_RESET_TRAFFIC;
} else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
$order->type = 3;
$order->type = Order::TYPE_UPGRADE;
} else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
$order->type = 2;
$order->type = Order::TYPE_RENEWAL;
} else {
$order->type = 1;
$order->type = Order::TYPE_NEW_PURCHASE;
}
$orderService->setInvite($user);
app/Http/Controllers/V1/Admin/Server/GroupController.php
+1 -2
View File
@@ -19,8 +19,7 @@ class GroupController extends Controller
return $this->success([ServerGroup::find($request->input('group_id'))]);
}
$serverGroups = ServerGroup::get();
$serverService = new ServerService();
$servers = $serverService->getAllServers();
$servers = ServerService::getAllServers();
foreach ($serverGroups as $k => $v) {
$serverGroups[$k]['user_count'] = User::where('group_id', $v['id'])->count();
$serverGroups[$k]['server_count'] = 0;
app/Http/Controllers/V1/Admin/Server/ManageController.php
+1 -2
View File
@@ -12,8 +12,7 @@ class ManageController extends Controller
{
public function getNodes(Request $request)
{
$serverService = new ServerService();
return $this->success($serverService->getAllServers());
return $this->success(ServerService::getAllServers());
}
public function sort(Request $request)
app/Http/Controllers/V1/Admin/Server/TrojanController.php
-8
View File
@@ -2,12 +2,10 @@
namespace App\Http\Controllers\V1\Admin\Server;
use App\Exceptions\ApiException;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ServerTrojanSave;
use App\Http\Requests\Admin\ServerTrojanUpdate;
use App\Models\ServerTrojan;
use App\Services\ServerService;
use Illuminate\Http\Request;
class TrojanController extends Controller
@@ -75,10 +73,4 @@ class TrojanController extends Controller
ServerTrojan::create($server->toArray());
return $this->success(true);
}
public function viewConfig(Request $request)
{
$serverService = new ServerService();
$config = $serverService->getTrojanConfig($request->input('node_id'), 23333);
return $this->success($config);
}
}
app/Http/Controllers/V1/Admin/TicketController.php
+1 -1
View File
@@ -80,7 +80,7 @@ class TicketController extends Controller
]);
try {
$ticket = Ticket::findOrFail($request->input('id'));
$ticket->status = 1;
$ticket->status = Ticket::STATUS_CLOSED;
$ticket->save();
return $this->success(true);
} catch (ModelNotFoundException $e) {