1.增加支持mov

@@ -94,7 +94,7 @@ class AdminMakeVideoController extends AdminController
                 ->options([1=>'视频', 2=>'图文音频'])
                 ->options([1=>'视频', 2=>'图文音频'])
                 ->when(1,function (Form $form){
                 ->when(1,function (Form $form){
                     $form->file('video_url','上传视频')
                     $form->file('video_url','上传视频')
-                        ->accept('mp4')
+//                        ->accept('mp4,mov')
                         ->autoUpload()
                         ->autoUpload()
                         ->uniqueName()
                         ->uniqueName()
                         ->maxSize('102400')
                         ->maxSize('102400')

@@ -23,7 +23,7 @@ class HomeController extends Controller
 
 
     public function packpoem(Request $request)
     public function packpoem(Request $request)
     {
     {
-        $packpoems = PackPoem::query()->simplePaginate();
+        $packpoems = PackPoem::query()->where('state',0)->paginate(0);
 
 
         return Response::success($packpoems);
         return Response::success($packpoems);
     }
     }

@@ -7,9 +7,11 @@ use App\Jobs\SendVerificationMessage;
 use App\Models\User;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Validator;
 use Jiannei\Response\Laravel\Support\Facades\Response;
 use Jiannei\Response\Laravel\Support\Facades\Response;
 
 
@@ -29,7 +31,7 @@ class UserController extends Controller
         }
         }
 
 
         try{
         try{
-            $user = User::query()->where('email', $request->email)->first();
+            $user = User::query()->where('email', $request->email)->where('state', 1)->first();
 
 
             if (! $user || ! Hash::check($request->password, $user->password)) {
             if (! $user || ! Hash::check($request->password, $user->password)) {
                 Response::errorUnauthorized();
                 Response::errorUnauthorized();
@@ -58,7 +60,6 @@ class UserController extends Controller
             return Response::fail('',500,$validator->errors());
             return Response::fail('',500,$validator->errors());
         }
         }
 
 
-
         try{
         try{
             $redis = Redis::connection();
             $redis = Redis::connection();
 
 
@@ -106,6 +107,22 @@ class UserController extends Controller
             return Response::fail('',500,$validator->errors());
             return Response::fail('',500,$validator->errors());
         }
         }
 
 
+        try{
+            $user = Auth::user();
+
+            $user->avatar = $request->avatar;
+
+            $user->save();
+
+        }catch ( \Exception $exception ){
+            return Response::fail('',500,$exception->getMessage());
+        }
+
+        return Response::success(['avatar' => $user->avatar]);
+    }
+
+    public function user()
+    {
         $user = Auth::user();
         $user = Auth::user();
 
 
         return Response::success($user);
         return Response::success($user);

@@ -37,6 +37,7 @@ class CancelUnpaidOrder implements ShouldQueue
             return;
             return;
         }
         }
 
 
-        $this->order->timeoutCanceled();
+        $this->order->status = Order::TIMEOUT_CANCEL;
+        $this->order->save();
     }
     }
 }
 }

@@ -49,9 +49,4 @@ class Order extends Model
         return $Sn;
         return $Sn;
     }
     }
 
 
-    public function timeoutCanceled()
-    {
-        $this->status = self::TIMEOUT_CANCEL;
-        $this->save();
-    }
 }
 }
\ No newline at end of file

@@ -5,6 +5,8 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 use Laravel\Sanctum\HasApiTokens;
 use Laravel\Sanctum\HasApiTokens;
 
 
 class User extends Authenticatable
 class User extends Authenticatable
@@ -36,4 +38,18 @@ class User extends Authenticatable
         'password',
         'password',
         'remember_token',
         'remember_token',
     ];
     ];
+
+    public function getAvatarAttribute($avatar)
+    {
+        if ($avatar == '' || empty($avatar)){
+            return admin_asset('@admin/images/default-avatar.jpg');
+        }
+
+        if (Str::contains('//',$avatar)){
+            return $avatar;
+        }
+
+        return Storage::disk('public')->url($avatar);
+    }
+
 }
 }

@@ -38,6 +38,8 @@ Route::prefix('v1')->namespace('App\Http\Controllers\V1')->group(function (Route
     /** 设置头像*/
     /** 设置头像*/
     $api->post('/avatar', 'UserController@avatar')->middleware('auth:sanctum');
     $api->post('/avatar', 'UserController@avatar')->middleware('auth:sanctum');
 
 
+    /** 用户信息*/
+    $api->get('/user', 'UserController@user')->middleware('auth:sanctum');
 
 
 
 
     /** 临境 */
     /** 临境 */