Fix 注册失败

app/Console/Commands/UserTrafficWarning.php

@@ -32,7 +32,7 @@ class UserTrafficWarning extends Command
         User::activeUser()->where('transfer_enable', '>', 0)->chunk(config('tasks.chunk'), function ($users) use ($trafficWarningPercent) {
             foreach ($users as $user) {
                 // 用户账号不是邮箱的跳过
-                if (filter_var($user->email, FILTER_VALIDATE_EMAIL) === false) {
+                if (filter_var($user->username, FILTER_VALIDATE_EMAIL) === false) {
                     continue;
                 }
 

app/Http/Controllers/Api/Client/V1Controller.php

@@ -19,7 +19,7 @@ class V1Controller extends Controller
     public function login(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'email' => 'required|email',
+            'username' => 'required|'.(sysConfig('username_type') ?? 'email'),
             'password' => 'required|string|min:6',
         ]);
 
@@ -37,19 +37,19 @@ class V1Controller extends Controller
     protected function createNewToken($token)
     {
         return response()->json([
-            'ret' => 1,
+            'ret'          => 1,
             'access_token' => $token,
-            'token_type' => 'bearer',
-            'expires_in' => auth()->factory()->getTTL() * 60,
-            'user' => auth()->user()->profile(),
+            'token_type'   => 'bearer',
+            'expires_in'   => auth()->factory()->getTTL() * 60,
+            'user'         => auth()->user()->profile(),
         ]);
     }
 
     public function register(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'name' => 'required|string|between:2,100',
-            'email' => 'required|string|email|max:100|unique:users',
+            'name'     => 'required|string|between:2,100',
+            'username' => 'required|'.(sysConfig('username_type') ?? 'email').'|max:100|unique:user,username',
             'password' => 'required|string|confirmed|min:6',
         ]);
 

app/Http/Controllers/AuthController.php

@@ -8,7 +8,6 @@ use App\Http\Requests\Auth\RegisterRequest;
 use App\Models\EmailFilter;
 use App\Models\Invite;
 use App\Models\User;
-use App\Models\UserLoginLog;
 use App\Models\Verify;
 use App\Models\VerifyCode;
 use App\Notifications\AccountActivation;
@@ -22,7 +21,6 @@ use Hash;
 use Hashids\Hashids;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Log;
 use Notification;
 use Redirect;
 use Response;
@@ -181,7 +179,7 @@ class AuthController extends Controller
 
         // 校验域名邮箱黑白名单
         if (sysConfig('is_email_filtering')) {
-            $result = $this->emailChecker($data['email'], 1);
+            $result = $this->emailChecker($data['username'], 1);
             if ($result !== false) {
                 return $result;
             }
@@ -619,13 +617,12 @@ class AuthController extends Controller
     // 发送注册验证码
     public function sendCode(Request $request)
     {
-        $validator = Validator::make($request->all(), ['email' => 'required|email|unique:user,email']);
-
-        $email = $request->input('email');
+        $validator = Validator::make($request->all(), ['username' => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user,username']);
 
         if ($validator->fails()) {
             return Response::json(['status' => 'fail', 'message' => $validator->getMessageBag()->first()]);
         }
+        $email = $request->input('username');
         $ip = IP::getClientIP();
 
         // 校验域名邮箱黑白名单

app/Http/Controllers/TelegramController.php

@@ -100,7 +100,7 @@ class TelegramController extends Controller
         if (! isset($msg->args[0])) {
             abort(500, '参数有误，请携带邮箱地址发送');
         }
-        $user = User::where('email', $msg->args[0])->first();
+        $user = User::whereUsername($msg->args[0])->first();
         if (! $user) {
             abort(500, '用户不存在');
         }

app/Http/Requests/Auth/RegisterRequest.php

@@ -10,7 +10,7 @@ class RegisterRequest extends FormRequest
     {
         return [
             'nickname' => 'required',
-            'username' => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user',
+            'username' => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user,username',
             'password' => 'required|min:6|confirmed',
             'term'     => 'accepted',
         ];

resources/views/admin/aff/detail.blade.php

@@ -22,7 +22,7 @@
                         <thead class="thead-default">
                         <tr>
                             <th colspan="6">
-                                申请单ID：{{$referral->id}} | 申请人：{{$referral->user->email}} | 申请提现金额：¥{{$referral->amount}} | 申请时间：{{$referral->created_at}}
+                                申请单ID：{{$referral->id}} | 申请人：{{$referral->user->username}} | 申请提现金额：¥{{$referral->amount}} | 申请时间：{{$referral->created_at}}
                             </th>
                         </tr>
                         <tr>
@@ -39,7 +39,7 @@
 
                             <tr>
                                 <td> {{$commission->id}} </td>
-                                <td> {{$commission->invitee->email ?? '【'.trans('common.deleted_item', ['attribute' => trans('common.account')]).'】'}} </td>
+                                <td> {{$commission->invitee->username ?? '【'.trans('common.deleted_item', ['attribute' => trans('common.account')]).'】'}} </td>
                                 <td>
                                     @can('admin.order')
                                         <a href="{{route('admin.order', ['id' => $commission->order->id])}}" target="_blank">

resources/views/admin/ticket/index.blade.php

@@ -20,7 +20,7 @@
             <div class="panel-body">
                 <form class="form-row">
                     <div class="form-group col-lg-3 col-sm-6">
-                        <input type="text" class="form-control" name="email" value="{{Request::query('email')}}" placeholder="用户账号" autocomplete="off"/>
+                        <input type="text" class="form-control" name="username" value="{{Request::query('username')}}" placeholder="用户账号" autocomplete="off"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button type="submit" class="btn btn-primary">搜 索</button>
@@ -46,9 +46,9 @@
                                     【{{trans('common.deleted_item', ['attribute' => trans('common.account')])}}】
                                 @else
                                     @can('admin.user.index')
-                                        <a href="{{route('admin.user.index', ['id'=>$ticket->user->id])}}" target="_blank">{{$ticket->user->email}}</a>
+                                        <a href="{{route('admin.user.index', ['id'=>$ticket->user->id])}}" target="_blank">{{$ticket->user->username}}</a>
                                     @else
-                                        {{$ticket->user->email}}
+                                        {{$ticket->user->username}}
                                     @endcan
                                 @endif
                             </td>

resources/views/auth/register.blade.php

@@ -171,7 +171,7 @@
                 return false;
             }
             email += '@' + emailTail;
-            $('#email').val(email);
+            $('#username').val(email);
             return email;
         }
         @endif
@@ -179,7 +179,7 @@
         // 发送注册验证码
         function sendVerifyCode() {
             let flag = true; // 请求成功与否标记
-            let email = $('#email').val().trim();
+            let email = $('#username').val().trim();
             @if($emailList)
                 email = getEmail();
             @endif
@@ -193,7 +193,7 @@
                 method: 'POST',
                 url: '{{route('sendVerificationCode')}}',
                 dataType: 'json',
-                data: {_token: '{{csrf_token()}}', email: email},
+                data: {_token: '{{csrf_token()}}', username: email},
                 success: function(ret) {
                     if (ret.status === 'success') {
                         swal.fire({title: ret.message, icon: 'success'});

resources/views/user/invite.blade.php

@@ -52,7 +52,7 @@
                                     <td>
                                         {!! $invite->status_label !!}
                                     </td>
-                                    {{$invite->status === 1 ? ($invite->invitee->email ?? '【'.trans('common.deleted_item', ['attribute' => trans('common.account')]).'】') : ''}}
+                                    {{$invite->status === 1 ? ($invite->invitee->username ?? '【'.trans('common.deleted_item', ['attribute' => trans('common.account')]).'】') : ''}}
                                 </tr>
                             @endforeach
                             </tbody>

resources/views/user/layouts.blade.php

@@ -170,7 +170,7 @@
     @if(Session::get("admin"))
         <div class="panel panel-bordered w-300 bg-grey-200" style="position:fixed;right:20px;bottom:0;">
             <div class="panel-body text-right">
-                <h5>{{trans('user.current_role')}}：{{Auth::getUser()->email}}</h5>
+                <h5>{{trans('user.current_role')}}：{{Auth::getUser()->username}}</h5>
                 <button type="button" class="btn btn-danger btn-block mt-20" id="return_to_admin">
                     {{trans('common.back').trans('user.menu.admin_dashboard')}}
                 </button>