diff --git a/app/Components/Helpers.php b/app/Components/Helpers.php index f3507f23..82db109d 100644 --- a/app/Components/Helpers.php +++ b/app/Components/Helpers.php @@ -67,11 +67,9 @@ class Helpers $user->username = $email; $user->email = $email; $user->password = $password; - // 生成一个可用端口 - $user->port = self::getPort(); + $user->port = self::getPort(); // 生成一个可用端口 $user->passwd = Str::random(); $user->vmess_id = Str::uuid(); - $user->enable = 1; $user->method = self::getDefaultMethod(); $user->protocol = self::getDefaultProtocol(); $user->obfs = self::getDefaultObfs(); @@ -79,8 +77,6 @@ class Helpers $user->expired_at = date('Y-m-d', strtotime('+'.$data.' days')); $user->reg_ip = IP::getClientIp(); $user->inviter_id = $inviter_id; - $user->reset_time = null; - $user->status = 0; $user->save(); return $user->id; diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index a4b97e8f..8290e58b 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -145,9 +145,9 @@ class UserController extends Controller $data['reset_time'] = $data['reset_time'] > date('Y-m-d') ? $data['reset_time'] : null; $user = User::create($data); - $roles = $request->input('roles'); - if ($roles && (Auth::getUser()->hasPermissionTo('give roles') || Auth::getUser()->hasRole('Super Admin')) - || (in_array('Super Admin', $roles, true) && Auth::getUser()->hasRole('Super Admin'))) { + $roles = $request->input('roles') ?? []; + if ($roles && (Auth::getUser()->hasPermissionTo('give roles') || (in_array('Super Admin', $roles, true) && Auth::getUser()->hasRole('Super Admin')) + || Auth::getUser()->hasRole('Super Admin'))) { $user->assignRole($roles); } @@ -198,10 +198,10 @@ class UserController extends Controller $data['remark'] = str_replace(['atob', 'eval'], '', $data['remark']); // 只有超级管理员才能赋予超级管理员 - $roles = $request->input('roles'); + $roles = $request->input('roles') ?? []; - if ($roles && (Auth::getUser()->hasPermissionTo('give roles') || Auth::getUser()->hasRole('Super Admin')) - || (in_array('Super Admin', $roles, true) && Auth::getUser()->hasRole('Super Admin'))) { + if ($roles && (Auth::getUser()->hasPermissionTo('give roles') || (in_array('Super Admin', $roles, true) && Auth::getUser()->hasRole('Super Admin')) || + Auth::getUser()->hasRole('Super Admin'))) { $user->syncRoles($roles); } diff --git a/app/Http/Controllers/Gateway/Local.php b/app/Http/Controllers/Gateway/Local.php index 52b80df0..e568aaf8 100644 --- a/app/Http/Controllers/Gateway/Local.php +++ b/app/Http/Controllers/Gateway/Local.php @@ -6,6 +6,7 @@ use App\Components\Helpers; use App\Models\Goods; use App\Models\Order; use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; use Response; class Local extends AbstractPayment @@ -27,7 +28,7 @@ class Local extends AbstractPayment return Response::json(['status' => 'success', 'message' => '购买完成!']); } - public function notify($request): void + public function notify(Request $request): void { } }