dump version

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'));
             }
 

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([

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'));
         }
 

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,

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,

config/version.php

@@ -2,6 +2,6 @@
 
 return [
     'name' => 'ProxyPanel',
-    'number' => '3.0.a',
+    'number' => '3.0.0',
     'ads' => env('ADS', null),
 ];

database/seeders/DatabaseSeeder.php

@@ -33,7 +33,7 @@ class DatabaseSeeder extends Seeder
         }
         if (User::doesntExist()) {
             // 生成初始管理账号
-            $user = Helpers::addUser('[email protected]', '123456', 100 * GiB, sysConfig('default_days'), null, '管理员');
+            $user = Helpers::addUser('[email protected]', '123456', 100 * GiB, (int) sysConfig('default_days'), null, '管理员');
             $user->update(['status' => 1]);
             $user->assignRole('Super Admin');
         }

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流量/月 性价比不错