tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-03-14 08:48:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: correct know file issues

Browse Source
This commit is contained in:
xboard 2025-01-09 15:58:32 +08:00
parent cd7c1ca34b
commit 720aa415ac
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V2/Admin/StatController.php
View File

@ -89,8 +89,8 @@ class StatController extends Controller
'paid_count' => 0, 'paid_count' => 0,
'commission_total' => 0, 'commission_total' => 0,
'commission_count' => 0, 'commission_count' => 0,
'start_date' => $request->input('start_date', date('Y-m-d', $statistics->last()->record_at)), 'start_date' => $request->input('start_date', date('Y-m-d', $statistics->last()?->record_at)),
'end_date' => $request->input('end_date', date('Y-m-d', $statistics->first()->record_at)), 'end_date' => $request->input('end_date', date('Y-m-d', $statistics->first()?->record_at)),
'avg_paid_amount' => 0, 'avg_paid_amount' => 0,
'avg_commission_amount' => 0 'avg_commission_amount' => 0
]; ];

5
app/Models/Server.php
View File

@ -185,11 +185,12 @@ class Server extends Model
$this->password = $user->uuid; $this->password = $user->uuid;
if (!isset($this->cipher) || !isset(self::CIPHER_CONFIGURATIONS[$this->cipher])) { $cipher = data_get($this, 'protocol_settings.cipher');
if (!$cipher || !isset(self::CIPHER_CONFIGURATIONS[$cipher])) {
return; return;
} }
$config = self::CIPHER_CONFIGURATIONS[$this->cipher]; $config = self::CIPHER_CONFIGURATIONS[$cipher];
$serverKey = Helper::getServerKey($this->created_at, $config['serverKeySize']); $serverKey = Helper::getServerKey($this->created_at, $config['serverKeySize']);
$userKey = Helper::uuidToBase64($user->uuid, $config['userKeySize']); $userKey = Helper::uuidToBase64($user->uuid, $config['userKeySize']);
$this->password = "{$serverKey}:{$userKey}"; $this->password = "{$serverKey}:{$userKey}";

2
app/Protocols/ClashMeta.php
View File

@ -130,7 +130,7 @@ class ClashMeta implements ProtocolInterface
$array['server'] = $server['host']; $array['server'] = $server['host'];
$array['port'] = $server['port']; $array['port'] = $server['port'];
$array['cipher'] = data_get($server['protocol_settings'], 'cipher'); $array['cipher'] = data_get($server['protocol_settings'], 'cipher');
$array['password'] = $password; $array['password'] = data_get($server, 'password', $password);
$array['udp'] = true; $array['udp'] = true;
return $array; return $array;
} }

1
app/Protocols/General.php
View File

@ -53,6 +53,7 @@ class General implements ProtocolInterface
{ {
$protocol_settings = $server['protocol_settings']; $protocol_settings = $server['protocol_settings'];
$name = rawurlencode($server['name']); $name = rawurlencode($server['name']);
$password = data_get($server, 'password', $password);
$str = str_replace( $str = str_replace(
['+', '/', '='], ['+', '/', '='],
['-', '_', ''], ['-', '_', ''],

1
app/Protocols/QuantumultX.php
View File

@ -44,6 +44,7 @@ class QuantumultX implements ProtocolInterface
public static function buildShadowsocks($password, $server) public static function buildShadowsocks($password, $server)
{ {
$protocol_settings = $server['protocol_settings']; $protocol_settings = $server['protocol_settings'];
$password = data_get($server, 'password', $password);
$config = [ $config = [
"shadowsocks={$server['host']}:{$server['port']}", "shadowsocks={$server['host']}:{$server['port']}",
"method={$protocol_settings['cipher']}", "method={$protocol_settings['cipher']}",

1
app/Protocols/Shadowrocket.php
View File

@ -60,6 +60,7 @@ class Shadowrocket implements ProtocolInterface
{ {
$protocol_settings = $server['protocol_settings']; $protocol_settings = $server['protocol_settings'];
$name = rawurlencode($server['name']); $name = rawurlencode($server['name']);
$password = data_get($server, 'password', $password);
$str = str_replace( $str = str_replace(
['+', '/', '='], ['+', '/', '='],
['-', '_', ''], ['-', '_', ''],

2
app/Protocols/SingBox.php
View File

@ -107,7 +107,7 @@ class SingBox implements ProtocolInterface
$array['server'] = $server['host']; $array['server'] = $server['host'];
$array['server_port'] = $server['port']; $array['server_port'] = $server['port'];
$array['method'] = data_get($server, 'protocol_settings.cipher'); $array['method'] = data_get($server, 'protocol_settings.cipher');
$array['password'] = $password; $array['password'] = data_get($server, 'password', $password);
return $array; return $array;
} }

6
app/Services/ServerService.php
View File

@ -40,7 +40,9 @@ class ServerService
$server->loadParentCreatedAt(); $server->loadParentCreatedAt();
$server->handlePortAllocation(); $server->handlePortAllocation();
$server->loadServerStatus(); $server->loadServerStatus();
if ($server->type === 'shadowsocks') {
$server->server_key = Helper::getServerKey($server->created_at, 16); $server->server_key = Helper::getServerKey($server->created_at, 16);
}
$server->generateShadowsocksPassword($user); $server->generateShadowsocksPassword($user);
return $server; return $server;
@ -48,6 +50,10 @@ class ServerService
->toArray(); ->toArray();
} }
/**
* 加
*/
/** /**
* 根据权限组获取可用的用户列表 * 根据权限组获取可用的用户列表
* @param array $groupIds * @param array $groupIds