From 72863974ec06e14961adcd9636a5d1339eb830c3 Mon Sep 17 00:00:00 2001 From: BrettonYe <867057410@qq.com> Date: Sun, 26 Nov 2023 16:08:27 +0800 Subject: [PATCH] dump version --- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/Api/Client/AuthController.php | 2 +- app/Http/Controllers/AuthController.php | 2 +- app/Http/Controllers/OAuthController.php | 2 +- app/Utils/Helpers.php | 6 +++--- config/version.php | 2 +- database/seeders/DatabaseSeeder.php | 2 +- readme.md | 13 ------------- 8 files changed, 9 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 78fff7b6..298b569b 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -176,7 +176,7 @@ class UserController extends Controller { try { for ($i = 0; $i < (int) request('amount', 1); $i++) { - $user = Helpers::addUser(Str::random(8).'@auto.generate', Str::random(), 1024 * GiB, 365); + $user = Helpers::addUser(Str::random(8).'@auto.generate', Str::random(), (int) sysConfig('default_traffic'), (int) sysConfig('default_days')); Helpers::addUserTrafficModifyLog($user->id, 0, 1024 * GiB, trans('admin.user.massive.note')); } diff --git a/app/Http/Controllers/Api/Client/AuthController.php b/app/Http/Controllers/Api/Client/AuthController.php index cf3df4b6..0a576b12 100644 --- a/app/Http/Controllers/Api/Client/AuthController.php +++ b/app/Http/Controllers/Api/Client/AuthController.php @@ -39,7 +39,7 @@ class AuthController extends Controller $data = $validator->validated(); // 创建新用户 - if ($user = Helpers::addUser($data['username'], $data['password'], (int) sysConfig('default_traffic'), sysConfig('default_days'), null, $data['nickname'])) { + if ($user = Helpers::addUser($data['username'], $data['password'], (int) sysConfig('default_traffic'), (int) sysConfig('default_days'), null, $data['nickname'])) { auth()->login($user, true); return $this->succeed([ diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 6321f8fc..010e3812 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -238,7 +238,7 @@ class AuthController extends Controller $transfer_enable = MiB * ((int) sysConfig('default_traffic') + ($inviter_id ? (int) sysConfig('referral_traffic') : 0)); // 创建新用户 - if (! $user = Helpers::addUser($data['username'], $data['password'], $transfer_enable, sysConfig('default_days'), $inviter_id, $data['nickname'])) { // 注册失败，抛出异常 + if (! $user = Helpers::addUser($data['username'], $data['password'], $transfer_enable, (int) sysConfig('default_days'), $inviter_id, $data['nickname'])) { // 注册失败，抛出异常 return Redirect::back()->withInput()->withErrors(trans('auth.register.failed')); } diff --git a/app/Http/Controllers/OAuthController.php b/app/Http/Controllers/OAuthController.php index 204a0a08..21404f41 100644 --- a/app/Http/Controllers/OAuthController.php +++ b/app/Http/Controllers/OAuthController.php @@ -109,7 +109,7 @@ class OAuthController extends Controller if ($OauthUser) { if (User::whereUsername($OauthUser->getEmail())->doesntExist() && UserOauth::whereIdentifier($OauthUser->getId())->doesntExist()) { // 排除重复用户注册 - $user = Helpers::addUser($OauthUser->getEmail(), Str::random(), MiB * ((int) sysConfig('default_traffic')), null, $OauthUser->getNickname()); + $user = Helpers::addUser($OauthUser->getEmail(), Str::random(), MiB * sysConfig('default_traffic'), (int) sysConfig('default_days'), $OauthUser->getNickname()); $user->userAuths()->create([ 'type' => $type, diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php index b8b0a726..ea385af4 100644 --- a/app/Utils/Helpers.php +++ b/app/Utils/Helpers.php @@ -49,11 +49,11 @@ class Helpers * @param string $username 用户 * @param string $password 用户密码 * @param int $transfer_enable 可用流量 - * @param string|null $date 可使用天数 + * @param int $date 可使用天数 * @param int|null $inviter_id 邀请人 * @param string|null $nickname 昵称 */ - public static function addUser(string $username, string $password, int $transfer_enable, string $date = null, int $inviter_id = null, string $nickname = null): User + public static function addUser(string $username, string $password, int $transfer_enable = 0, int $date = 0, int $inviter_id = null, string $nickname = null): User { return User::create([ 'nickname' => $nickname ?? $username, @@ -66,7 +66,7 @@ class Helpers 'protocol' => self::getDefaultProtocol(), 'obfs' => self::getDefaultObfs(), 'transfer_enable' => $transfer_enable, - 'expired_at' => date('Y-m-d', strtotime("$date days")), + 'expired_at' => now()->addDays($date)->format('Y-m-d'), 'user_group_id' => null, 'reg_ip' => IP::getClientIp(), 'inviter_id' => $inviter_id, diff --git a/config/version.php b/config/version.php index 2991bd91..2e475756 100644 --- a/config/version.php +++ b/config/version.php @@ -2,6 +2,6 @@ return [ 'name' => 'ProxyPanel', - 'number' => '3.0.a', + 'number' => '3.0.0', 'ads' => env('ADS', null), ]; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 4d7e8dd9..4cee87b2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -33,7 +33,7 @@ class DatabaseSeeder extends Seeder } if (User::doesntExist()) { // 生成初始管理账号 - $user = Helpers::addUser('test@test.com', '123456', 100 * GiB, sysConfig('default_days'), null, '管理员'); + $user = Helpers::addUser('test@test.com', '123456', 100 * GiB, (int) sysConfig('default_days'), null, '管理员'); $user->update(['status' => 1]); $user->assignRole('Super Admin'); } diff --git a/readme.md b/readme.md index bb77fc17..62a62296 100644 --- a/readme.md +++ b/readme.md @@ -48,19 +48,6 @@ This project is base on Laravel 10 Framework This means anything Laravel 10 is r - SQL Server 2017+ [Version Policy](https://docs.microsoft.com/en-us/lifecycle/products/?products=sql-server) - Redis -## ADS -- 【EtoPay】国际支付，安全稳定 - - 开户门槛：无 - - 业务范围：机场、idc、发卡 - - 结算周期：D+2 - - 结算方式：USDT - - 结算门槛：100cny - - 结算手续费：1% - - 通道费率： - - 💰 WechatPay（微信支付）7% - - 💰 Alipay（支付宝支付）7% - - 开户联系: [@etopay888](https://t.me/etopay888) - ## Nice VPS - [Kdatacenter](https://www.kdatacenter.com/myportal/?affid=470) - 韩国SK线路，19刀（优惠后16.91刀） 1TB流量/月 性价比不错