mirror of
https://github.com/lkddi/Xboard.git
synced 2026-04-14 19:40:53 +08:00
perf: 优化流量消费相关代码性能,解决流量纪录与已用流量有概率不一致的问题
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Jobs;
|
||||
|
||||
use App\Services\StatisticalService;
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
@@ -12,12 +12,13 @@ use Illuminate\Queue\SerializesModels;
|
||||
class TrafficFetchJob implements ShouldQueue
|
||||
{
|
||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||
protected $data;
|
||||
protected $u;
|
||||
protected $d;
|
||||
protected $userId;
|
||||
protected $server;
|
||||
protected $childServer;
|
||||
protected $protocol;
|
||||
protected $timestamp;
|
||||
public $tries = 1;
|
||||
|
||||
public $tries = 3;
|
||||
public $timeout = 10;
|
||||
|
||||
/**
|
||||
@@ -25,55 +26,33 @@ class TrafficFetchJob implements ShouldQueue
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(array $server, array $data, $protocol, int $timestamp, $childServer = null)
|
||||
public function __construct($u, $d, $userId, array $server, $protocol)
|
||||
{
|
||||
$this->onQueue('traffic_fetch');
|
||||
$this->u = $u;
|
||||
$this->d = $d;
|
||||
$this->userId = $userId;
|
||||
$this->server = $server;
|
||||
$this->data = $data;
|
||||
$this->protocol = $protocol;
|
||||
$this->timestamp = $timestamp;
|
||||
$this->childServer = $childServer;
|
||||
}
|
||||
|
||||
public function handle(): void
|
||||
/**
|
||||
* Execute the job.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
if ($this->attempts() === 1) {
|
||||
$statService = new StatisticalService();
|
||||
$statService->setStartAt($this->timestamp);
|
||||
$statService->setUserStats();
|
||||
$statService->setServerStats();
|
||||
}
|
||||
// 获取子节点\
|
||||
$targetServer = $this->childServer ?? $this->server;
|
||||
foreach ($this->data as $uid => $v) {
|
||||
\DB::transaction(function () use ($uid, $v, $targetServer, $statService) {
|
||||
$u = $v[0];
|
||||
$d = $v[1];
|
||||
$user = \DB::table('v2_user')->lockForUpdate()->where('id', $uid)->first();
|
||||
if (!$user) {
|
||||
return;
|
||||
}
|
||||
if ($this->attempts() === 1) { // 写缓存
|
||||
$statService->statUser($targetServer['rate'], $uid, $u, $d); //如果存在子节点则使用子节点的倍率
|
||||
if (!blank($this->childServer)) { //如果存在子节点,则给子节点计算流量
|
||||
$statService->statServer($this->childServer['id'], $this->protocol, $u, $d);
|
||||
}
|
||||
$statService->statServer($this->server['id'], $this->protocol, $u, $d);
|
||||
}
|
||||
$newTime = time();
|
||||
$newU = $user->u + ($v[0] * $targetServer['rate']);
|
||||
$newD = $user->d + ($v[1] * $targetServer['rate']);
|
||||
$rows = \DB::table('v2_user')
|
||||
->where('id', $uid)
|
||||
->update([
|
||||
't' => $newTime,
|
||||
'u' => $newU,
|
||||
'd' => $newD,
|
||||
]);
|
||||
if($rows === 0){
|
||||
\Log::error("流量更新失败\n未记录用户ID:{$uid}\n未记录上行:{$user->u}\n未记录下行:{$user->d}");
|
||||
}
|
||||
}, 3);
|
||||
}
|
||||
\DB::transaction(function () {
|
||||
$user = User::lockForUpdate()->find($this->userId);
|
||||
if (!$user)
|
||||
return;
|
||||
$user->t = time();
|
||||
$user->u = $user->u + ($this->u * $this->server['rate']);
|
||||
$user->d = $user->d + ($this->d * $this->server['rate']);
|
||||
if (!$user->save()) {
|
||||
info("流量更新失败\n未记录用户ID:{$this->userId}\n未记录上行:{$user->u}\n未记录下行:{$user->d}");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user