合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2793

@@ -10,6 +10,7 @@
 namespace App\Console\Commands\SyncFilesImage;
 namespace App\Console\Commands\SyncFilesImage;
 
 
 use App\Models\File\File;
 use App\Models\File\File;
+use App\Models\File\Image;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 
 
 class SyncProjectFile extends Command
 class SyncProjectFile extends Command
@@ -31,7 +32,7 @@ class SyncProjectFile extends Command
 
 
     public function handle(){
     public function handle(){
         $project_id = $this->argument('project_id');
         $project_id = $this->argument('project_id');
-        $fileModel = new File();
+        $fileModel = new Image();
         $lists = $fileModel->list(['project_id'=>$project_id]);//未同步成功的图片及文件
         $lists = $fileModel->list(['project_id'=>$project_id]);//未同步成功的图片及文件
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){
             if(strpos($v['path'], '/181/') !== false ){
             if(strpos($v['path'], '/181/') !== false ){

@@ -254,7 +254,6 @@ Route::middleware(['aloginauth'])->group(function () {
     // 售后工单改版
     // 售后工单改版
     Route::prefix('tickets')->group(function () {
     Route::prefix('tickets')->group(function () {
         Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表');
         Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表');
-        Route::post('/lists', [Aside\WorkOrder\AsideTicketController::class, 'lists'])->name('admin.tickets.lists')->summary('A端工单列表2');
         Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
         Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
         Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');
         Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');